Merge pull request #29 from robbyoconnor/master

[master] CCache doesn't seem to be working -- add this in the entrypoint

Author: kylemanna

Dockerfile

@@ -35,10 +35,6 @@ COPY ssh_config /root/.ssh/config
 # considered to be ephemeral
 VOLUME ["/tmp/ccache", "/aosp"]
 
-# Improve rebuild performance by enabling compiler cache
-ENV USE_CCACHE 1
-ENV CCACHE_DIR /tmp/ccache
-
 # Work in the build directory, repo is expected to be init'd here
 WORKDIR /aosp
 

docker-compose.yml

@@ -4,6 +4,6 @@ services:
   aosp:
     image: kylemanna/aosp:latest
     volumes:
-      - /tmp/ccache:/ccache
+      - ~/aosp/ccache:/tmp/ccache
       - ~/aosp:/aosp
       - ~/.gitconfig:/root/.gitconfig

utils/docker_entrypoint.sh

@@ -17,6 +17,10 @@ set -e
 if [ -z ${USER_ID+x} ]; then USER_ID=1000; fi
 if [ -z ${GROUP_ID+x} ]; then GROUP_ID=1000; fi
 
+# ccache
+export CCACHE_DIR=/tmp/ccache
+export USE_CCACHE=1
+
 msg="docker_entrypoint: Creating user UID/GID [$USER_ID/$GROUP_ID]" && echo $msg
 groupadd -g $GROUP_ID -r aosp && \
 useradd -u $USER_ID --create-home -r -g aosp aosp