Working docker image

Author: Iain Connor

Dockerfile

@@ -11,6 +11,8 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV VERSION_SDK_TOOLS "25.1.7"
 ENV VERSION_BUILD_TOOLS "24.0.2"
 ENV VERSION_TARGET_SDK "24"
+ENV VERSION_EMULATOR_GOOGLE_APIS_TARGET_SDK "23"
+# There's no 24 emulator with Google APIs yet.
 
 ENV ANDROID_HOME "/sdk"
 ENV PATH "$PATH:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools"
@@ -32,7 +34,7 @@ RUN apt-get -qq update && \
         build-essential \
         expect \
         file \
-        libmagic1
+        libmagic1 \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Fix certificates
@@ -54,29 +56,44 @@ RUN chmod +x /usr/local/bin/tools/wait-for-emulator.sh
 
 # And use them to install Android dependencies
 
-RUN ["/opt/tools/android-accept-licenses.sh", "android update sdk --all --no-ui --filter \
-     platform-tools, \
-     android-${VERSION_TARGET_SDK}, \
-     build-tools-${VERSION_BUILD_TOOLS}, \
-     sys-img-armeabi-v7a-google_apis-${VERSION_TARGET_SDK}, \
-     extra-android-m2repository, \
-     extra-google-m2repository, \
-     extra-android-support, \
-     extra-google-google_play_services"]
+RUN /usr/local/bin/tools/agree-to-licenses.sh \
+  "android update sdk --all --no-ui --filter platform-tools,android-${VERSION_TARGET_SDK},android-${VERSION_EMULATOR_GOOGLE_APIS_TARGET_SDK},build-tools-${VERSION_BUILD_TOOLS},sys-img-armeabi-v7a-android-${VERSION_TARGET_SDK},sys-img-armeabi-v7a-google_apis-${VERSION_EMULATOR_GOOGLE_APIS_TARGET_SDK},extra-android-support,extra-android-m2repository,extra-google-m2repository,extra-google-google_play_services"
 
-# Create emulator
+# Create emulators
 
+RUN android list targets
+
+# Without Google APIs
 RUN echo "no" | android create avd \
                 --force \
                 --device "Nexus 5" \
                 --name nexus5_${VERSION_TARGET_SDK} \
                 --target android-${VERSION_TARGET_SDK} \
+                --abi default/armeabi-v7a \
+                --skin WVGA800 \
+                --sdcard 512M
+
+# With Google APIs
+RUN echo "no" | android create avd \
+                --force \
+                --device "Nexus 5" \
+                --name nexus5_${VERSION_EMULATOR_GOOGLE_APIS_TARGET_SDK} \
+                --target android-${VERSION_EMULATOR_GOOGLE_APIS_TARGET_SDK} \
                 --abi google_apis/armeabi-v7a \
                 --skin WVGA800 \
                 --sdcard 512M
 
-# Boot up the emulator
+# Boot up the emulators
+
+# Without Google APIs
+RUN /bin/bash -c "SHELL=/bin/bash emulator -avd nexus5_${VERSION_TARGET_SDK} -no-skin -no-audio -no-window & \
+    adb wait-for-device && \
+    /usr/local/bin/tools/wait-for-emulator.sh" && \
+    adb -s emulator-5554 emu kill
+
 
-RUN ["/bin/bash", "-c", "SHELL=/bin/bash emulator -avd nexus5_${VERSION_TARGET_SDK} -no-skin -no-audio -no-window & /usr/local/bin/tools/wait-for-emulator.sh"]
-RUN adb wait-for-device
-RUN android-start-emulator nexus5_${VERSION_TARGET_SDK} && adb -s emulator-5554 emu kill
+# With Google APIs
+RUN /bin/bash -c "SHELL=/bin/bash emulator -avd nexus5_${VERSION_EMULATOR_GOOGLE_APIS_TARGET_SDK} -no-skin -no-audio -no-window & \
+    adb wait-for-device && \
+    /usr/local/bin/tools/wait-for-emulator.sh" && \
+    adb -s emulator-5554 emu kill

tools/agree-to-licenses.sh

@@ -1,8 +1,7 @@
-#!/usr/bin/env bash
+#!/usr/bin/expect -f
 
 set timeout 1800
 set cmd [lindex $argv 0]
-set licenses [lindex $argv 1]
 
 spawn {*}$cmd
 expect {

tools/wait-for-emulator.sh

@@ -11,7 +11,7 @@ until [[ "$bootanim" =~ "stopped" ]]; do
   if [[ "$bootanim" =~ "device not found" || "$bootanim" =~ "device offline"
     || "$bootanim" =~ "running" ]]; then
     let "failcounter += 1"
-    echo "Waiting for emulator to start"
+    echo "Waiting for emulator to start [$failcounter / $timeout_in_sec]"
     if [[ $failcounter -gt timeout_in_sec ]]; then
       echo "Timeout ($timeout_in_sec seconds) reached; failed to start emulator"
       exit 1