AGDIGGER-21 - removed unsed parts of the image

aerogear · Nov 30, 2016 · ef7db88 · ef7db88
1 parent b25e09b
commit ef7db88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/docker/README.md b/docker/README.md
@@ -65,7 +65,6 @@ Jenkins Kubernetes plugin slaves:
 
 -  [android-slave](./android-slave)
 
-
 ## Build
 
 To build slave execute docker build

diff --git a/docker/android-slave/Dockerfile b/docker/android-slave/Dockerfile
@@ -28,9 +28,7 @@ RUN chown -R 1001:0 $HOME && \
     chmod -R g+rw $HOME
 
 # Install build dependencies
-RUN yum install -y git wget python curl 
-## Support native builds
-# RUN yum install gcc gcc-c++ make openssl-devel
+RUN yum install -y git wget python curl expect expectk
 
 # Copy install tools
 COPY tools /opt/tools
@@ -41,12 +39,10 @@ RUN cd /opt && wget --output-document=android-sdk.tgz --quiet https://dl.google.
   tar xzf android-sdk.tgz && \
   rm -f android-sdk.tgz
 
-RUN yum install -y expect expectk
-
 RUN cd /opt && chown -R root.root android-sdk-linux && \
   chmod -R 777 /opt/tools && \
   /opt/tools/android-accept-licenses.sh "android-sdk-linux/tools/android update sdk --all --no-ui --filter platform-tools,tools" && \
-  /opt/tools/android-accept-licenses.sh "android-sdk-linux/tools/android update sdk --all --no-ui --filter platform-tools,tools,build-tools-21.0.0,build-tools-21.0.1,build-tools-21.0.2,build-tools-21.1.0,build-tools-21.1.1,build-tools-21.1.2,build-tools-22.0.0,build-tools-22.0.1,build-tools-23.0.0,build-tools-23.0.3,build-tools-24.0.0,build-tools-24.0.1,build-tools-24.0.2,build-tools-24.0.3,build-tools-25.0.0,android-21,android-22,android-23,android-24,android-25,addon-google_apis_x86-google-21,extra-android-support,extra-android-m2repository,extra-google-m2repository,extra-google-google_play_services,sys-img-armeabi-v7a-android-24"
+  /opt/tools/android-accept-licenses.sh "android-sdk-linux/tools/android update sdk --all --no-ui --filter platform-tools,tools,build-tools-25.0.0,android-25,addon-google_apis_x86-google-21,extra-android-support,extra-google-google_play_services,sys-img-armeabi-v7a-android-24"
 
 # Setup environment
 ENV ANDROID_HOME /opt/android-sdk-linux
@@ -57,19 +53,6 @@ RUN which android
 
 RUN android list targets
 
-# Create emulator
-# RUN echo "no" | android create avd \
-#                 --force \
-#                 --device "Nexus 5" \
-#                 --name test \
-#                 --target android-24 \
-#                 --abi armeabi-v7a \
-#                 --skin WVGA800 \
-#                 --sdcard 512M
-
-# Install Cordova
-#RUN npm install -g cordova
-
 # GO to workspace
 RUN mkdir -p /opt/workspace
 WORKDIR /opt/workspace