@@ -15,9 +15,8 @@ ENV DOCKER_ANDROID_DISPLAY_NAME mobileci-docker
1515ENV DEBIAN_FRONTEND noninteractive
1616
1717# Updating & Installing packages
18- RUN apt-get update \
19- && apt-get dist-upgrade -y \
20- && apt-get install -y \
18+ RUN apt-get update && apt-get install -y \
19+ wget \
2120 autoconf \
2221 build-essential \
2322 bzip2 \
@@ -59,14 +58,12 @@ RUN apt-add-repository ppa:openjdk-r/ppa \
5958# Environment variables
6059ENV ANDROID_HOME /usr/local/android-sdk
6160ENV ANDROID_SDK_HOME $ANDROID_HOME
62- ENV ANDROID_NDK_HOME /usr/local/android-ndk
6361ENV JENKINS_HOME $HOME
6462ENV PATH ${INFER_HOME}/bin:${PATH}
6563ENV PATH $PATH:$ANDROID_SDK_HOME/tools
6664ENV PATH $PATH:$ANDROID_SDK_HOME/platform-tools
6765ENV PATH $PATH:$ANDROID_SDK_HOME/build-tools/23.0.2
6866ENV PATH $PATH:$ANDROID_SDK_HOME/build-tools/24.0.0
69- ENV PATH $PATH:$ANDROID_NDK_HOME
7067
7168# Export JAVA_HOME variable
7269ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
@@ -96,14 +93,6 @@ RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter "${ANDROID
9693 && chown -R $RUN_USER:$RUN_USER $ANDROID_HOME \
9794 && chmod -R a+rx $ANDROID_HOME
9895
99- # Install Android NDK
100- RUN wget http://dl.google.com/android/repository/android-ndk-r12-linux-x86_64.zip \
101- && unzip android-ndk-r12-linux-x86_64.zip \
102- && mv android-ndk-r12 /usr/local/android-ndk \
103- && chown -R $RUN_USER:$RUN_USER $ANDROID_NDK_HOME \
104- && chmod -R a+rx $ANDROID_NDK_HOME \
105- && rm android-ndk-r12-linux-x86_64.zip
106-
10796# Support Gradle
10897ENV TERM dumb
10998ENV JAVA_OPTS "-Xms4096m -Xmx4096m"
@@ -117,4 +106,4 @@ RUN chown -R $RUN_USER:$RUN_USER $PROJECT
117106WORKDIR $PROJECT
118107
119108USER $RUN_USER
120- RUN echo "sdk.dir=$ANDROID_HOME" > local.properties
109+ RUN echo "sdk.dir=$ANDROID_HOME" > local.properties
0 commit comments