Update all assets

.github/workflows/docker.yml

@@ -0,0 +1,67 @@
+name: Docker Image
+
+on:
+  schedule:
+    - cron: "0 12 * * *" # everyday at 12am
+  push:
+    branches: ["**"]
+    tags: ["v*.*.*"]
+
+env:
+  platforms: linux/amd64,linux/arm64/v8,linux/arm/v7
+
+jobs:
+  main:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 20
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Set imageName based on the repository name
+        id: step_one
+        run: |
+            imageName="${GITHUB_REPOSITORY/docker-/}"
+            echo $imageName
+            echo "imageName=$imageName" >> $GITHUB_ENV
+      - name: Docker meta
+        id: docker_meta
+        uses: crazy-max/ghaction-docker-meta@v1
+        with:
+          images: ${{ env.imageName }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to Harbor
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Buildx cache
+        uses: actions/cache@v1
+        with:
+          path: ${{ github.workspace }}/cache
+          key: ${{ runner.os }}-docker-${{ hashfiles('cache/**') }}
+          restore-keys: |
+            ${{ runner.os }}-docker
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          platforms: ${{ env.platforms }}
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
+          cache-from: type=local,src=${{ github.workspace }}/cache
+          cache-to: type=local,dest=${{ github.workspace }}/cache
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: ${{ env.imageName }}:${{ steps.docker_meta.outputs.version }}
+          format: "template"
+          template: "@/contrib/sarif.tpl"
+          output: "trivy-results.sarif"
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: "trivy-results.sarif"

Dockerfile

@@ -5,34 +5,34 @@ ARG BUILD_VERSION
 ARG VCS_REF
 
 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"
+    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 \
+ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip" \
+    ANDROID_BUILD_TOOLS_VERSION=30.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/tools/bin:$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/cmdline-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
 
@@ -46,16 +46,15 @@ RUN mkdir android && cd android && \
 
 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"
-
-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"
+    while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_HOME} "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" "platforms;android-30" && \
+    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" &&  \
+    while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_HOME} "add-ons;addon-google_apis-google-22" "add-ons;addon-google_apis-google-23" "add-ons;addon-google_apis-google-24" "skiaparser;1"
 
 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
+    apt-get clean && \
+    mvn -v && gradle -v && java -version && ant -version

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2015-2020 Maik Hummel
+Copyright (c) 2015-2021 Maik Hummel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,17 +1,16 @@
-[![Travis](https://shields.beevelop.com/travis/beevelop/docker-android.svg?style=flat-square)](https://travis-ci.org/beevelop/docker-android)
 [![Docker Pulls](https://shields.beevelop.com/docker/pulls/beevelop/android.svg?style=flat-square)](https://links.beevelop.com/d-android)
 [![Layers](https://shields.beevelop.com/docker/image/layers/beevelop/android/latest.svg?style=flat-square)](https://links.beevelop.com/d-android)
 [![Size](https://shields.beevelop.com/docker/image/size/beevelop/android/latest.svg?style=flat-square)](https://links.beevelop.com/d-android)
 [![GitHub release](https://shields.beevelop.com/github/release/beevelop/docker-android.svg?style=flat-square)](https://github.com/beevelop/docker-android/releases)
 ![Badges](https://shields.beevelop.com/badge/badges-7-brightgreen.svg?style=flat-square)
 [![Beevelop](https://links.beevelop.com/honey-badge)](https://beevelop.com)
 
-# Android 10.0 (Q)
+# Android 11.0
 ### based on [beevelop/java](https://github.com/beevelop/docker-java)
-- Ant 1.10.5
-- Apache Maven 3.6.0
-- Java 1.8.0_242
+- Java 11
 - Gradle 4.4.1 (Groovy: 2.4.16)
+- Apache Maven 3.6.3
+- Ant 1.10.7
 
 ### Pull from Docker Hub
 ```