From 3b2ec82a0d139eeae0dca0d5aa111a1588ba1461 Mon Sep 17 00:00:00 2001 From: Maik Hummel Date: Sat, 3 Feb 2018 12:19:15 +0100 Subject: [PATCH 1/8] Update build tools and add API 27 (8.1.0) --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b52eef8..02dba7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ FROM beevelop/java MAINTAINER Maik Hummel ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/tools_r25.2.5-linux.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" \ + ANDROID_BUILD_TOOLS_VERSION=27.0.3 \ + 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,android-27" \ ANT_HOME="/usr/share/ant" \ MAVEN_HOME="/usr/share/maven" \ GRADLE_HOME="/usr/share/gradle" \ From ed0b878ebe61d52110b8ea67912dafbdb48c48ed Mon Sep 17 00:00:00 2001 From: Maik Hummel Date: Sat, 3 Feb 2018 12:20:51 +0100 Subject: [PATCH 2/8] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 39d3cdb..2bac482 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,15 @@ ![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 8 (SDK Tools 25.2) ### 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 +- Android SDK `25.2.5` +    + APIs: `android-10, android-15 to android-27` +    + Build-Tools: `27.0.3` ---- ## Tagging scheme From 8099ade275e041aea581dde7d1c5593b80bf71a0 Mon Sep 17 00:00:00 2001 From: Maik Hummel Date: Mon, 26 Feb 2018 11:26:38 +0100 Subject: [PATCH 3/8] Use sdkmanager to install everything --- Dockerfile | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 02dba7f..ccd7472 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,28 +4,44 @@ MAINTAINER Maik Hummel ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/tools_r25.2.5-linux.zip" \ ANDROID_BUILD_TOOLS_VERSION=27.0.3 \ - 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,android-27" \ 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 && \ + apt-get -qq install -y wget curl maven ant gradle libncurses5:i386 libstdc++6:i386 zlib1g:i386 # Installs Android SDK - mkdir android && cd android && \ +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 "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-10" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-15" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-16" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-17" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-18" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-19" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-20" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-21" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-22" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-23" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-24" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-25" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-26" && \ + while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-27" +RUN chmod a+x -R $ANDROID_HOME && \ + chown -R root:root $ANDROID_HOME && \ + rm -rf /opt/android/licenses && \ # Clean up rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ apt-get autoremove -y && \ From 80c0072aabd18ddba2209c76691b6929eb172f2e Mon Sep 17 00:00:00 2001 From: Maik Hummel Date: Tue, 15 May 2018 18:41:37 +0200 Subject: [PATCH 4/8] Minor changes --- Dockerfile | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index ccd7472..69587c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM beevelop/java MAINTAINER Maik Hummel -ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/tools_r25.2.5-linux.zip" \ +ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip" \ ANDROID_BUILD_TOOLS_VERSION=27.0.3 \ ANT_HOME="/usr/share/ant" \ MAVEN_HOME="/usr/share/maven" \ @@ -24,20 +24,11 @@ RUN mkdir android && cd android && \ RUN mkdir /root/.android && touch /root/.android/repositories.cfg && \ while true; do echo 'y'; sleep 2; done | sdkmanager "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-10" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-15" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-16" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-17" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-18" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-19" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-20" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-21" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-22" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-23" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-24" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-25" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-26" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-27" + while true; do echo 'y'; sleep 2; done | sdkmanager "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 "platforms;android-20" "platforms;android-21" "platforms;android-22" "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" "platforms;android-27" + +RUN while true; do echo 'y'; sleep 2; done | sdkmanager "extras;android;m2repository" "extras;google;google_play_services" "extras;google;instantapps" "extras;google;m2repository" +RUN while true; do echo 'y'; sleep 2; done | sdkmanager "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 && \ From 6c1b4ecb0ccc7e3f6a3fb1b60d45a6e53f1e1fff Mon Sep 17 00:00:00 2001 From: Maik Hummel Date: Mon, 23 Mar 2020 22:32:08 +0100 Subject: [PATCH 5/8] Update to new commandlinetools --- Dockerfile | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index a000f55..7ba77de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM beevelop/java -ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip" \ +# 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.2 \ ANT_HOME="/usr/share/ant" \ MAVEN_HOME="/usr/share/maven" \ @@ -11,28 +12,26 @@ ENV PATH $PATH:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platfor 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 +# Installs Android SDK RUN mkdir android && cd android && \ wget -O tools.zip ${ANDROID_SDK_URL} && \ unzip tools.zip && rm tools.zip RUN mkdir /root/.android && touch /root/.android/repositories.cfg && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" && \ - while true; do echo 'y'; sleep 2; done | sdkmanager "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 "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 "platforms;android-28" "platforms;android-29" + 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" -RUN while true; do echo 'y'; sleep 2; done | sdkmanager "extras;android;m2repository" "extras;google;google_play_services" "extras;google;instantapps" "extras;google;m2repository" -RUN while true; do echo 'y'; sleep 2; done | sdkmanager "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 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 && \ - # Clean up rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ apt-get autoremove -y && \ apt-get clean From 7bc57dbb9474df66f3e842d95b9e83781fa90000 Mon Sep 17 00:00:00 2001 From: Maik Hummel Date: Mon, 23 Mar 2020 22:35:47 +0100 Subject: [PATCH 6/8] Update Metadata --- .travis.yml | 6 +++--- Dockerfile | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8bd8481..46b1ecc 100644 --- a/.travis.yml +++ b/.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" diff --git a/Dockerfile b/Dockerfile index 7ba77de..6ee4bd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,29 @@ FROM beevelop/java +ARG BUILD_DATE +ARG BUILD_VERSION +ARG VCS_REF + +LABEL maintainer="Maik Hummel " \ + 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.2 \ From cc7f0db981b9d88b07fdecc179f04d062f51c221 Mon Sep 17 00:00:00 2001 From: Maik Hummel Date: Mon, 23 Mar 2020 22:55:42 +0100 Subject: [PATCH 7/8] Update build-tools to 29.0.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6ee4bd5..fb94615 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ LABEL maintainer="Maik Hummel " \ # 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.2 \ + ANDROID_BUILD_TOOLS_VERSION=29.0.3 \ ANT_HOME="/usr/share/ant" \ MAVEN_HOME="/usr/share/maven" \ GRADLE_HOME="/usr/share/gradle" \ From 03bf883eaea034aa4916cf0d3af95f43c85d68e3 Mon Sep 17 00:00:00 2001 From: Maik Hummel Date: Mon, 23 Mar 2020 22:57:45 +0100 Subject: [PATCH 8/8] Update README --- README.md | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 2bac482..c48ecf7 100644 --- a/README.md +++ b/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 8 (SDK Tools 25.2) +# 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 `25.2.5` -    + APIs: `android-10, android-15 to android-27` -    + Build-Tools: `27.0.3` +- 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