updated Dockerfile for Debian bookworm

Author: alexanderwolz

README.md

@@ -1,7 +1,7 @@
 # Build Container for AOSP13+ (Docker)
 
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/alexanderwolz/aosp-docker)
-![GitHub](https://img.shields.io/badge/aosp-13-orange)
+![GitHub](https://img.shields.io/badge/aosp-14-orange)
 ![GitHub](https://img.shields.io/badge/docker-23.0.1-orange)
 ![GitHub](https://img.shields.io/badge/docker_compose-1.29.2-orange)
 ![GitHub](https://img.shields.io/github/license/alexanderwolz/aosp-docker)
@@ -10,7 +10,7 @@
 
 ## About
 
-This repository holds a Dockerfile to provide the needed toolchain for building AOSP13
+This repository holds a Dockerfile to provide the needed toolchain for building AOSP14+
 
 ## Install Docker CE and Compose
 1. Install Docker CE and Docker-Compose on your host machine (recommended: Debian, 30GB+, 8 Cores, 250GB+ HDD)
@@ -23,7 +23,7 @@ This repository holds a Dockerfile to provide the needed toolchain for building
 
 ## Download AOSP source
 This follows the normal AOSP approach, e.g.
-1. ```repo init --depth=1 -u https://android.googlesource.com/platform/manifest -b android-13.0.0_r11```
+1. ```repo init --depth=1 -u https://android.googlesource.com/platform/manifest -b android-14.0.0_r14```
 2. ```repo sync -c --no-tags --no-clone-bundle -j$(nproc --all)```
 
 ## Build AOSP

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye-20220125-slim
+FROM debian:bookworm-20231120-slim
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -8,7 +8,7 @@ gnupg zlib1g-dev libncurses5 x11proto-core-dev libx11-dev libgl1-mesa-dev gperf
 libc6-dev libxml2-utils xsltproc fontconfig openjdk-17-jdk libncurses6 procps \
 gcc-multilib g++-multilib libc6-dev-i386 lib32ncurses5-dev lib32z1-dev ccache \
 gnupg rsync lib32z1-dev python3 && ln -sf /usr/bin/python3 /usr/bin/python \
-&& adduser --system --group --uid 1000 aosp
+&& adduser --system --group --uid 1000 --home /home/aosp aosp
 
 # see https://source.android.com/setup/develop#installing-repo
 ARG REPO=/bin/repo
@@ -24,18 +24,15 @@ VOLUME /ccache
 RUN git config --global user.name "Your Name" \
 && git config --global user.email "you@example.com"
 
-WORKDIR /aosp
-
 USER aosp
 
-#aliases
-RUN echo "alias lstat=\"stat -L\"" >> ~/.bashrc
+RUN echo "alias lstat=\"stat -L\"" >> /home/aosp/.bashrc \
+&& echo "export USE_CCACHE=1" >> /home/aosp/.bashrc \
+&& echo "export CCACHE_EXEC=/usr/bin/ccache" >> /home/aosp/.bashrc \
+&& echo "export CCACHE_DIR=/ccache" >> /home/aosp/.bashrc \
+&& echo "ccache -M 50G > /dev/null" >> /home/aosp/.bashrc
 
-#enable ccache
-RUN echo "export USE_CCACHE=1" >> ~/.bashrc \
-&& echo "export CCACHE_EXEC=/usr/bin/ccache" >> ~/.bashrc \
-&& echo "export CCACHE_DIR=/ccache" >> ~/.bashrc \
-&& echo "ccache -M 50G > /dev/null" >> ~/.bashrc
+WORKDIR /aosp
 
 # we want to run that container forever until we shut it down manually
 # TODO find a better way

docker-compose.yml

@@ -8,6 +8,6 @@ services:
     volumes: 
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
-      - ./config/gitconfig:/root/.gitconfig:ro
+      - ./config/gitconfig:/home/aosp/.gitconfig:ro
       - ~/aosp:/aosp:rw
       - ~/ccache:/ccache:rw