Skip to content

Commit 699a6d4

Browse files
beevelopbeevelop
authored
Merge pull request #29 from beevelop/update
Update image
2 parents 15c4f25 + 4128591 commit 699a6d4

5 files changed

Lines changed: 100 additions & 44 deletions

File tree

‎.github/workflows/docker.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Docker Image
2+
3+
on:
4+
schedule:
5+
- cron: "0 13 * * *" # everyday at 1pm
6+
push:
7+
branches: ["**"]
8+
tags: ["v*.*.*"]
9+
10+
env:
11+
platforms: linux/amd64
12+
13+
jobs:
14+
main:
15+
runs-on: ubuntu-20.04
16+
timeout-minutes: 20
17+
steps:
18+
- name: Check out the repo
19+
uses: actions/checkout@v2
20+
- name: Set imageName based on the repository name
21+
id: step_one
22+
run: |
23+
imageName="${GITHUB_REPOSITORY/docker-/}"
24+
echo $imageName
25+
echo "imageName=$imageName" >> $GITHUB_ENV
26+
- name: Docker meta
27+
id: docker_meta
28+
uses: crazy-max/ghaction-docker-meta@v1
29+
with:
30+
images: ${{ env.imageName }}
31+
- name: Set up QEMU
32+
uses: docker/setup-qemu-action@v1
33+
- name: Set up Docker Buildx
34+
uses: docker/setup-buildx-action@v1
35+
- name: Login to Harbor
36+
uses: docker/login-action@v1
37+
with:
38+
username: ${{ secrets.DOCKERHUB_USERNAME }}
39+
password: ${{ secrets.DOCKERHUB_TOKEN }}
40+
- name: Buildx cache
41+
uses: actions/cache@v1
42+
with:
43+
path: ${{ github.workspace }}/cache
44+
key: ${{ runner.os }}-docker-${{ hashfiles('cache/**') }}
45+
restore-keys: |
46+
${{ runner.os }}-docker
47+
- name: Build and push
48+
id: docker_build
49+
uses: docker/build-push-action@v2
50+
with:
51+
platforms: ${{ env.platforms }}
52+
push: ${{ github.event_name != 'pull_request' }}
53+
tags: ${{ steps.docker_meta.outputs.tags }}
54+
labels: ${{ steps.docker_meta.outputs.labels }}
55+
cache-from: type=local,src=${{ github.workspace }}/cache
56+
cache-to: type=local,dest=${{ github.workspace }}/cache
57+
# temporarily disabled until https://github.com/aquasecurity/trivy-action/issues/22 is resolved
58+
# - name: Run Trivy vulnerability scanner
59+
# uses: aquasecurity/trivy-action@master
60+
# with:
61+
# image-ref: ${{ env.imageName }}:${{ steps.docker_meta.outputs.version }}
62+
# format: "template"
63+
# template: "@/contrib/sarif.tpl"
64+
# output: "trivy-results.sarif"
65+
# - name: Upload Trivy scan results to GitHub Security tab
66+
# uses: github/codeql-action/upload-sarif@v1
67+
# with:
68+
# sarif_file: "trivy-results.sarif"

‎.travis.yml‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Dockerfile‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,34 @@ ARG BUILD_VERSION
55
ARG VCS_REF
66

77
LABEL maintainer="Maik Hummel <hi@beevelop.com>" \
8-
org.label-schema.build-date=$BUILD_DATE \
9-
org.label-schema.version=$BUILD_VERSION \
10-
org.label-schema.vcs-ref=$VCS_REF \
11-
org.label-schema.schema-version="1.0" \
12-
org.label-schema.vcs-url="https://github.com/beevelop/docker-android.git" \
13-
org.label-schema.name="beevelop/android" \
14-
org.label-schema.vendor="Maik Hummel (beevelop)" \
15-
org.label-schema.description="Simple Android Docker image" \
16-
org.label-schema.url="https://beevelop.com/" \
17-
org.label-schema.license="MIT" \
18-
org.opencontainers.image.title="beevelop/android" \
19-
org.opencontainers.image.description="Simple Android Docker image" \
20-
org.opencontainers.image.licenses="MIT" \
21-
org.opencontainers.image.authors="Maik Hummel (beevelop)" \
22-
org.opencontainers.image.vendor="Maik Hummel (beevelop)" \
23-
org.opencontainers.image.url="https://github.com/beevelop/docker-android" \
24-
org.opencontainers.image.documentation="https://github.com/beevelop/docker-android/blob/master/README.md" \
25-
org.opencontainers.image.source="https://github.com/beevelop/docker-android.git"
8+
org.label-schema.build-date=$BUILD_DATE \
9+
org.label-schema.version=$BUILD_VERSION \
10+
org.label-schema.vcs-ref=$VCS_REF \
11+
org.label-schema.schema-version="1.0" \
12+
org.label-schema.vcs-url="https://github.com/beevelop/docker-android.git" \
13+
org.label-schema.name="beevelop/android" \
14+
org.label-schema.vendor="Maik Hummel (beevelop)" \
15+
org.label-schema.description="Simple Android Docker image" \
16+
org.label-schema.url="https://beevelop.com/" \
17+
org.label-schema.license="MIT" \
18+
org.opencontainers.image.title="beevelop/android" \
19+
org.opencontainers.image.description="Simple Android Docker image" \
20+
org.opencontainers.image.licenses="MIT" \
21+
org.opencontainers.image.authors="Maik Hummel (beevelop)" \
22+
org.opencontainers.image.vendor="Maik Hummel (beevelop)" \
23+
org.opencontainers.image.url="https://github.com/beevelop/docker-android" \
24+
org.opencontainers.image.documentation="https://github.com/beevelop/docker-android/blob/master/README.md" \
25+
org.opencontainers.image.source="https://github.com/beevelop/docker-android.git"
2626

2727
# https://developer.android.com/studio/#downloads
28-
ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip" \
29-
ANDROID_BUILD_TOOLS_VERSION=29.0.3 \
28+
ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip" \
29+
ANDROID_BUILD_TOOLS_VERSION=30.0.3 \
3030
ANT_HOME="/usr/share/ant" \
3131
MAVEN_HOME="/usr/share/maven" \
3232
GRADLE_HOME="/usr/share/gradle" \
3333
ANDROID_HOME="/opt/android"
3434

35-
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
35+
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
3636

3737
WORKDIR /opt
3838

@@ -46,16 +46,15 @@ RUN mkdir android && cd android && \
4646

4747
RUN mkdir /root/.android && touch /root/.android/repositories.cfg && \
4848
while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_HOME} "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" && \
49-
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" && \
50-
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" && \
51-
while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_HOME} "platforms;android-28" "platforms;android-29"
52-
53-
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"
54-
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"
49+
while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_HOME} "platforms;android-25" "platforms;android-26" "platforms;android-27" && \
50+
while true; do echo 'y'; sleep 2; done | sdkmanager --sdk_root=${ANDROID_HOME} "platforms;android-28" "platforms;android-29" "platforms;android-30" && \
51+
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" && \
52+
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"
5553

5654
RUN chmod a+x -R $ANDROID_HOME && \
5755
chown -R root:root $ANDROID_HOME && \
5856
rm -rf /opt/android/licenses && \
5957
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
6058
apt-get autoremove -y && \
61-
apt-get clean
59+
apt-get clean && \
60+
mvn -v && gradle -v && java -version && ant -version

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2015-2020 Maik Hummel
3+
Copyright (c) 2015-2021 Maik Hummel
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
[![Travis](https://shields.beevelop.com/travis/beevelop/docker-android.svg?style=flat-square)](https://travis-ci.org/beevelop/docker-android)
21
[![Docker Pulls](https://shields.beevelop.com/docker/pulls/beevelop/android.svg?style=flat-square)](https://links.beevelop.com/d-android)
32
[![Layers](https://shields.beevelop.com/docker/image/layers/beevelop/android/latest.svg?style=flat-square)](https://links.beevelop.com/d-android)
43
[![Size](https://shields.beevelop.com/docker/image/size/beevelop/android/latest.svg?style=flat-square)](https://links.beevelop.com/d-android)
54
[![GitHub release](https://shields.beevelop.com/github/release/beevelop/docker-android.svg?style=flat-square)](https://github.com/beevelop/docker-android/releases)
65
![Badges](https://shields.beevelop.com/badge/badges-7-brightgreen.svg?style=flat-square)
76
[![Beevelop](https://links.beevelop.com/honey-badge)](https://beevelop.com)
87

9-
# Android 10.0 (Q)
8+
# Android 11.0
109
### based on [beevelop/java](https://github.com/beevelop/docker-java)
11-
- Ant 1.10.5
12-
- Apache Maven 3.6.0
13-
- Java 1.8.0_242
10+
- Java 11
1411
- Gradle 4.4.1 (Groovy: 2.4.16)
12+
- Apache Maven 3.6.3
13+
- Ant 1.10.7
1514

1615
### Pull from Docker Hub
1716
```

0 commit comments

Comments
 (0)