From 3a961ec2a11373cf7ed1338749bcb3ba423f714b Mon Sep 17 00:00:00 2001
From: Robert O'Connor <rob@oconnor.ninja>
Date: Sat, 15 Jul 2017 19:12:25 -0400
Subject: [PATCH 1/2] CCache doesn't seem to be working -- add this in the
 entrypoint

---
 Dockerfile                 | 4 ----
 utils/docker_entrypoint.sh | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2329e0f..74c673d 100644
--- a/Dockerfile
+++ b/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
 
diff --git a/utils/docker_entrypoint.sh b/utils/docker_entrypoint.sh
index 5fbce3f..1e0b014 100755
--- a/utils/docker_entrypoint.sh
+++ b/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

From 9e0d1008298ed65141e6efd37c1c254014d5477f Mon Sep 17 00:00:00 2001
From: Robert O'Connor <rob@oconnor.ninja>
Date: Sat, 15 Jul 2017 19:33:31 -0400
Subject: [PATCH 2/2] store ccache volume in the source directory

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index cd977c9..b21eb16 100644
--- a/docker-compose.yml
+++ b/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