Skip to content

Commit 0e46c2e

Browse files
authored
use --no-cache and keep wget installed
1 parent 687ff0a commit 0e46c2e

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/tools_r25.2.5-linu
1515
ENV PATH="$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$ANT_HOME/bin:$MAVEN_HOME/bin:$GRADLE_HOME/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin:${PATH}"
1616

1717
RUN mkdir android
18-
RUN apk --update add curl wget maven apache-ant gradle bash openjdk8 git && \
18+
RUN apk --no-cache --update add curl wget maven apache-ant gradle bash openjdk8 git && \
1919
wget -q -O android/tools.zip ${ANDROID_SDK_URL} && \
20-
apk del wget && \
21-
rm -rf /var/cache/apk/* && \
22-
unzip -q android/tools.zip -d android/ && rm android/tools.zip
23-
RUN apk --no-cache --allow-untrusted -X https://apkproxy.herokuapp.com/sgerrand/alpine-pkg-glibc add glibc glibc-bin && \
24-
rm -rf /var/cache/apk/*
20+
unzip -q android/tools.zip -d android/ && \
21+
rm android/tools.zip
22+
RUN apk --no-cache --allow-untrusted -X https://apkproxy.herokuapp.com/sgerrand/alpine-pkg-glibc add glibc glibc-bin
2523
RUN echo y | android update sdk -a -u -t platform-tools,${ANDROID_APIS},build-tools-${ANDROID_BUILD_TOOLS_VERSION}
2624
RUN chmod a+x -R $ANDROID_HOME
2725
RUN chown -R root:root $ANDROID_HOME

0 commit comments

Comments
 (0)