1
0
mirror of https://github.com/stucki/docker-lineageos synced 2024-12-19 17:12:29 -05:00

remove android-env-vars.sh

This commit is contained in:
Benedikt Heine 2017-05-30 19:24:02 +02:00
parent c66a2ba12d
commit 3047d501cd
3 changed files with 8 additions and 9 deletions

View File

@ -3,7 +3,13 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
MAINTAINER Michael Stucki <michael@stucki.io> MAINTAINER Michael Stucki <michael@stucki.io>
ENV \ ENV \
# ccache specifics
CCACHE_SIZE=50G \
CCACHE_DIR=/srv/ccache \
USE_CCACHE=1 \
CCACHE_COMPRESS=1 \
# Extra include PATH, it may not include /usr/local/(s)bin on some systems # Extra include PATH, it may not include /usr/local/(s)bin on some systems
PATH=$PATH:/usr/local/bin/ PATH=$PATH:/usr/local/bin/
@ -79,10 +85,6 @@ RUN chmod a+x /home/build/startup.sh
# Fix ownership # Fix ownership
RUN chown -R build:build /home/build RUN chown -R build:build /home/build
# Set global variables
ADD android-env-vars.sh /etc/android-env-vars.sh
RUN echo "source /etc/android-env-vars.sh" >> /etc/bash.bashrc
VOLUME /home/build/android VOLUME /home/build/android
VOLUME /srv/ccache VOLUME /srv/ccache

View File

@ -1,3 +0,0 @@
export USE_CCACHE=1
export CCACHE_DIR=/srv/ccache
export CCACHE_COMPRESS=1

View File

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
# Initialize ccache if needed # Initialize ccache if needed
if [ ! -f /srv/ccache/ccache.conf ]; then if [ ! -f ${CCACHE_DIR}/ccache.conf ]; then
echo "Initializing ccache in /srv/ccache..." echo "Initializing ccache in /srv/ccache..."
CCACHE_DIR=/srv/ccache ccache -M 50G ccache -M ${CCACHE_SIZE}
fi fi
export USER="build" export USER="build"