From 93b0d90aa8cf390260fd744ca63e6fa22c3f835a Mon Sep 17 00:00:00 2001 From: Amab Date: Wed, 9 Nov 2022 12:25:00 +0100 Subject: [PATCH 1/5] Update README --- README.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/README.md b/README.md index bbd6b63..e94b109 100644 --- a/README.md +++ b/README.md @@ -4,20 +4,6 @@ Docker for Android SDK with preinstalled build tools and emulator image > Edit from [docker-android-sdk/android-31](https://github.com/docker-android-sdk/android-31) -**Installed Packages** -```bash -# sdkmanager --list - Path | Version | Description | Location - ------- | ------- | ------- | ------- - build-tools;33.0.0 | 33.0.0 | Android SDK Build-Tools 33 | build-tools/33.0.0 - cmdline-tools;latest | 7.0 | Android SDK Command-line Tools (latest) | cmdline-tools/latest - emulator | 31.3.12 | Android Emulator | emulator - patcher;v4 | 1 | SDK Patch Applier v4 | patcher/v4 - platform-tools | 33.0.3 | Android SDK Platform-Tools | platform-tools - platforms;android-33 | 2 | Android SDK Platform 33 | platforms/android-33 - system-images;android-33;google_apis;x86_64 | 6 | Google APIs Intel x86 Atom_64 System Image | system-images/android-33/google_apis/x86_64 -``` - **Usage** - Interactive way From ac42650d6e93e97c1fe1c53614375192d3d698a5 Mon Sep 17 00:00:00 2001 From: Amab Date: Wed, 9 Nov 2022 12:45:50 +0100 Subject: [PATCH 2/5] Add Drone CI pipeline --- .drone.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..fb9c4cf --- /dev/null +++ b/.drone.yml @@ -0,0 +1,12 @@ +kind: pipeline +name: default + +steps: + - name: docker + image: plugins/docker:linux-amd64 + settings: + registry: ${DOCKER_REGISTRY} + username: ${DOCKER_USERNAME} + password: ${DOCKER_PASSWORD} + repo: Marown/android-sdk-docker + tags: latest From 5f7f259db1240d60d6b598a91075d9eb3a45d655 Mon Sep 17 00:00:00 2001 From: Amab Date: Wed, 9 Nov 2022 13:14:12 +0100 Subject: [PATCH 3/5] Fix Docker image tag --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index fb9c4cf..8f99541 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,5 +8,5 @@ steps: registry: ${DOCKER_REGISTRY} username: ${DOCKER_USERNAME} password: ${DOCKER_PASSWORD} - repo: Marown/android-sdk-docker + repo: marown/android-sdk-docker tags: latest From 55372137fce2251470404abbb1b66d73235804b2 Mon Sep 17 00:00:00 2001 From: Amab Date: Wed, 9 Nov 2022 13:32:14 +0100 Subject: [PATCH 4/5] Fix Docker image tag (try 2) --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8f99541..e849cd5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,5 +8,5 @@ steps: registry: ${DOCKER_REGISTRY} username: ${DOCKER_USERNAME} password: ${DOCKER_PASSWORD} - repo: marown/android-sdk-docker + repo: ${DOCKER_REGISTRY}/marown/android-sdk-docker tags: latest From a1ab15bcec02b826b1b96a8ddd2e15f039367b0e Mon Sep 17 00:00:00 2001 From: Amab Date: Wed, 9 Nov 2022 14:03:39 +0100 Subject: [PATCH 5/5] Fix recovery of Drone secrets --- .drone.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index e849cd5..bfcbdb1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,8 +5,10 @@ steps: - name: docker image: plugins/docker:linux-amd64 settings: - registry: ${DOCKER_REGISTRY} - username: ${DOCKER_USERNAME} - password: ${DOCKER_PASSWORD} - repo: ${DOCKER_REGISTRY}/marown/android-sdk-docker + registry: git.cuernodehipnos.es + username: + from_secret: docker_username + password: + from_secret: docker_password + repo: git.cuernodehipnos.es/marown/android-sdk-docker tags: latest