flywithu/docker-aosp
1
0
Fork 0
mirror of https://github.com/kylemanna/docker-aosp synced 2025-06-07 07:56:25 +00:00
Code Issues Releases Wiki Activity

Merge pull request #29 from robbyoconnor/master

Browse Source 
[master] CCache doesn't seem to be working -- add this in the entrypoint
This commit is contained in:
Kyle Manna 2017-07-15 21:06:42 -07:00 committed by GitHub
commit de429a4c20
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -35,10 +35,6 @@ COPY ssh_config /root/.ssh/config
# considered to be ephemeral # considered to be ephemeral
VOLUME ["/tmp/ccache", "/aosp"] 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 # Work in the build directory, repo is expected to be init'd here
WORKDIR /aosp WORKDIR /aosp

2
docker-compose.yml
View File

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

4
utils/docker_entrypoint.sh
View File

@ -17,6 +17,10 @@ set -e
if [ -z ${USER_ID+x} ]; then USER_ID=1000; fi if [ -z ${USER_ID+x} ]; then USER_ID=1000; fi
if [ -z ${GROUP_ID+x} ]; then GROUP_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 msg="docker_entrypoint: Creating user UID/GID [$USER_ID/$GROUP_ID]" && echo $msg
groupadd -g $GROUP_ID -r aosp && \ groupadd -g $GROUP_ID -r aosp && \
useradd -u $USER_ID --create-home -r -g aosp aosp useradd -u $USER_ID --create-home -r -g aosp aosp