Merge pull request #243 from nextcloud/androidUpdateWithSub

update android & androidbase
nextcloud · Sep 9, 2020 · a94a0d3 · a94a0d3
2 parents f8b6566 + b284a4f
commit a94a0d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/android/Dockerfile b/android/Dockerfile
@@ -47,11 +47,7 @@ RUN gem install xml-simple
 
 RUN wget https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux32 -O /usr/bin/jq && chmod +x /usr/bin/jq
 
-RUN sdkmanager --sdk_root=/opt/android-sdk-linux/ "platforms;android-27" 
 RUN sdkmanager --sdk_root=/opt/android-sdk-linux/ "platform-tools"
 
-RUN sdkmanager --sdk_root=/opt/android-sdk-linux/ "system-images;android-27;google_apis;x86"
-RUN (sleep 5; echo "no") | avdmanager create avd -n android-27 -c 100M -k "system-images;android-27;google_apis;x86" --abi "google_apis/x86"
-
 EXPOSE 5037
 WORKDIR /opt/workspace/
diff --git a/android8/Dockerfile b/android8/Dockerfile
@@ -1,6 +1,6 @@
 FROM nextcloudci/android:androidBase-2
 
-# Android 8 (API 26)
-RUN sdkmanager --sdk_root=/opt/android-sdk-linux/ "platforms;android-26"
-RUN sdkmanager --sdk_root=/opt/android-sdk-linux/ "system-images;android-26;google_apis;x86"
-RUN (sleep 5; echo "no") | avdmanager create avd -n android -c 100M -k "system-images;android-26;google_apis;x86" --abi "google_apis/x86"
+# Android 8.1 (API 27)
+RUN sdkmanager --sdk_root=/opt/android-sdk-linux/ "platforms;android-27"
+RUN sdkmanager --sdk_root=/opt/android-sdk-linux/ "system-images;android-27;google_apis;x86"
+RUN (sleep 5; echo "no") | avdmanager create avd -n android -c 100M -k "system-images;android-27;google_apis;x86" --abi "google_apis/x86"