Merge pull request #21 from beevelop/next

API 29 (10.0)

.travis.yml

@@ -4,7 +4,7 @@ services:
   - docker
 
 script:
-  - docker build -t beendroid .
-  - docker run -d beendroid
+  - docker build -t bee .
+  - docker run -d bee
   - docker ps -a
-  - docker run beendroid /bin/sh -c "mvn -v && gradle -v && java -version && ant -version"
+  - docker run bee /bin/sh -c "mvn -v && gradle -v && java -version && ant -version"

Dockerfile

@@ -1,32 +1,61 @@
 FROM beevelop/java
 
-MAINTAINER Maik Hummel <m@ikhummel.com>
+ARG BUILD_DATE
+ARG BUILD_VERSION
+ARG VCS_REF
 
-ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip" \
-    ANDROID_BUILD_TOOLS_VERSION=27.0.0 \
-    ANDROID_APIS="android-10,android-15,android-16,android-17,android-18,android-19,android-20,android-21,android-22,android-23,android-24,android-25,android-26" \
+LABEL maintainer="Maik Hummel <hi@beevelop.com>" \
+      org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.version=$BUILD_VERSION \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-url="https://github.com/beevelop/docker-android.git" \
+      org.label-schema.name="beevelop/android" \
+      org.label-schema.vendor="Maik Hummel (beevelop)" \
+      org.label-schema.description="Simple Android Docker image" \
+      org.label-schema.url="https://beevelop.com/" \
+      org.label-schema.license="MIT" \
+      org.opencontainers.image.title="beevelop/android" \
+      org.opencontainers.image.description="Simple Android Docker image" \
+      org.opencontainers.image.licenses="MIT" \
+      org.opencontainers.image.authors="Maik Hummel (beevelop)" \
+      org.opencontainers.image.vendor="Maik Hummel (beevelop)" \
+      org.opencontainers.image.url="https://github.com/beevelop/docker-android" \
+      org.opencontainers.image.documentation="https://github.com/beevelop/docker-android/blob/master/README.md" \
+      org.opencontainers.image.source="https://github.com/beevelop/docker-android.git"
+
+# https://developer.android.com/studio/#downloads
+ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip" \
+    ANDROID_BUILD_TOOLS_VERSION=29.0.3 \
     ANT_HOME="/usr/share/ant" \
     MAVEN_HOME="/usr/share/maven" \
     GRADLE_HOME="/usr/share/gradle" \
     ANDROID_HOME="/opt/android"
 
-ENV PATH $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
+ENV PATH $PATH:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$ANT_HOME/bin:$MAVEN_HOME/bin:$GRADLE_HOME/bin
 
 WORKDIR /opt
 
-RUN dpkg --add-architecture i386 && \
-    apt-get -qq update && \
-    apt-get -qq install -y wget curl maven ant gradle libncurses5:i386 libstdc++6:i386 zlib1g:i386 && \
+RUN apt-get -qq update && \
+    apt-get -qq install -y wget curl maven ant gradle
 
-    # Installs Android SDK
-    mkdir android && cd android && \
+# Installs Android SDK
+RUN mkdir android && cd android && \
     wget -O tools.zip ${ANDROID_SDK_URL} && \
-    unzip tools.zip && rm tools.zip && \
-    echo y | android update sdk -a -u -t platform-tools,${ANDROID_APIS},build-tools-${ANDROID_BUILD_TOOLS_VERSION} && \
-    chmod a+x -R $ANDROID_HOME && \
-    chown -R root:root $ANDROID_HOME && \
+    unzip tools.zip && rm tools.zip
+
+RUN mkdir /root/.android && touch /root/.android/repositories.cfg && \
+    while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_HOME} "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" && \
+    while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_HOME} "platforms;android-10" "platforms;android-15" "platforms;android-16" "platforms;android-17" "platforms;android-18" "platforms;android-19" && \
+    while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_HOME} "platforms;android-20" "platforms;android-21" "platforms;android-22" "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" "platforms;android-27" && \
+    while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_HOME} "platforms;android-28" "platforms;android-29"
 
-    # Clean up
+RUN while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_HOME} "extras;android;m2repository" "extras;google;google_play_services" "extras;google;instantapps" "extras;google;m2repository"
+RUN while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_HOME} "add-ons;addon-google_apis-google-15" "add-ons;addon-google_apis-google-16" "add-ons;addon-google_apis-google-17" "add-ons;addon-google_apis-google-18" "add-ons;addon-google_apis-google-19" "add-ons;addon-google_apis-google-21" "add-ons;addon-google_apis-google-22" "add-ons;addon-google_apis-google-23" "add-ons;addon-google_apis-google-24"
+
+RUN chmod a+x -R $ANDROID_HOME && \
+    chown -R root:root $ANDROID_HOME && \
+    rm -rf /opt/android/licenses && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     apt-get autoremove -y && \
     apt-get clean

README.md

@@ -6,21 +6,13 @@
 ![Badges](https://shields.beevelop.com/badge/badges-7-brightgreen.svg?style=flat-square)
 [![Beevelop](https://links.beevelop.com/honey-badge)](https://beevelop.com)
 
-# Android 7 (SDK 25.X)
+# Android 10.0 (Q)
 ### based on [beevelop/java](https://github.com/beevelop/docker-java)
-- Ant 1.9.6
-- Maven 3.3.9
-- Java 1.8.0_111
-- Gradle 2.10 (Groovy 2.4.5)
-- Android SDK 24.4.1
-    + APIs: android-10,android-15,android-16,android-17,android-18,android-19,android-20,android-21,android-22,android-23,android-24,android-25
-    + Build-Tools: 25.0.2
+- Ant 1.10.5
+- Apache Maven 3.6.0
+- Java 1.8.0_242
+- Gradle 4.4.1 (Groovy: 2.4.16)
 
-----
-## Tagging scheme
-- `v${TOOLS_VERSION}-${BUILD_TOOLS_VERSION}-${HIGHEST_ANDROID_SDK_VERSION}`
-- e.g. `v25.2.5-27.0.0-26`
-----
 ### Pull from Docker Hub
 ```
 docker pull beevelop/android:latest