From 101796d46c7ba8d5b977d9cf2030e71a6927f285 Mon Sep 17 00:00:00 2001 From: Amab Date: Sat, 15 Apr 2023 11:24:14 +0200 Subject: [PATCH 1/4] Enable Drone CI cache --- .drone.yml | 35 +++++++++++++++++++++++++++++++++++ Dockerfile | 4 ++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index bfcbdb1..3064edb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,6 +2,21 @@ kind: pipeline name: default steps: + - name: restore-cache-with-filesystem + image: meltwater/drone-cache:latest + pull: true + settings: + backend: "filesystem" + restore: true + cache_key: "volume" + archive_format: "gzip" + # filesystem_cache_root: "/tmp/cache" + mount: + - 'vendor' + volumes: + - name: cache + path: /tmp/cache + - name: docker image: plugins/docker:linux-amd64 settings: @@ -12,3 +27,23 @@ steps: from_secret: docker_password repo: git.cuernodehipnos.es/marown/android-sdk-docker tags: latest + + - name: rebuild-cache-with-filesystem + image: meltwater/drone-cache:latest + pull: true + settings: + backend: "filesystem" + rebuild: true + cache_key: "volume" + archive_format: "gzip" + # filesystem_cache_root: "/tmp/cache" + mount: + - 'vendor' + volumes: + - name: cache + path: /tmp/cache + +volumes: + - name: cache + host: + path: /share/CACHEDEV1_DATA/homes/admin/drone/cache/ diff --git a/Dockerfile b/Dockerfile index b11e9ca..38aeb11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV ANDROID_SDK ${ANDROID_HOME} ENV PATH "${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin" ENV PATH "${PATH}:${ANDROID_HOME}/cmdline-tools/tools/bin" ENV PATH "${PATH}:${ANDROID_HOME}/tools/bin" -ENV PATH "${PATH}:${ANDROID_HOME}/build-tools/33.0.0" +ENV PATH "${PATH}:${ANDROID_HOME}/build-tools/33.0.2" ENV PATH "${PATH}:${ANDROID_HOME}/platform-tools" ENV PATH "${PATH}:${ANDROID_HOME}/emulator" ENV PATH "${PATH}:${ANDROID_HOME}/bin" @@ -29,7 +29,7 @@ WORKDIR /opt/android-sdk-linux RUN /opt/tools/entrypoint.sh built-in RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "cmdline-tools;latest" -RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "build-tools;33.0.0" +RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "build-tools;33.0.2" RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platform-tools" RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platforms;android-33" RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "system-images;android-33;google_apis;x86_64" From 1a4e7c9a394b4d69844a6673f2d7b863b2d12c2a Mon Sep 17 00:00:00 2001 From: Amab Date: Sat, 15 Apr 2023 11:37:45 +0200 Subject: [PATCH 2/4] Fix cache paths --- .drone.yml | 6 ++++-- tools/android-env.sh | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3064edb..d2f4ee2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,8 @@ steps: archive_format: "gzip" # filesystem_cache_root: "/tmp/cache" mount: - - 'vendor' + - '/opt/android-sdk-linux' + - '/var/cache/apt/archives/' volumes: - name: cache path: /tmp/cache @@ -38,7 +39,8 @@ steps: archive_format: "gzip" # filesystem_cache_root: "/tmp/cache" mount: - - 'vendor' + - '/opt/android-sdk-linux' + - '/var/cache/apt/archives/' volumes: - name: cache path: /tmp/cache diff --git a/tools/android-env.sh b/tools/android-env.sh index 7ed5fb0..90a4531 100644 --- a/tools/android-env.sh +++ b/tools/android-env.sh @@ -8,7 +8,7 @@ export ANDROID_SDK=${ANDROID_HOME} export PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin export PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/tools/bin export PATH=${PATH}:${ANDROID_HOME}/tools/bin -export PATH=${PATH}:${ANDROID_HOME}/build-tools/33.0.0 +export PATH=${PATH}:${ANDROID_HOME}/build-tools/33.0.2 export PATH=${PATH}:${ANDROID_HOME}/platform-tools export PATH=${PATH}:${ANDROID_HOME}/emulator export PATH=${PATH}:${ANDROID_HOME}/bin @@ -26,7 +26,7 @@ function help() { figlet "usage:" echo "update_sdk: Updates the SDK" echo "andep: Installs one or more android Packets." - echo " -Example: anddep \"platforms;android-26\"" + echo " -Example: anddep \"platforms;android-33\"" echo "help: Shows this help" echo '' echo '' From 6004971baec4568f4fc5f4fb41ee12892b024f81 Mon Sep 17 00:00:00 2001 From: Amab Date: Sat, 15 Apr 2023 12:39:39 +0200 Subject: [PATCH 3/4] Optimize Dockerfile --- .drone.yml | 6 ++---- Dockerfile | 26 ++++++++++++-------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index d2f4ee2..6373bc4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,8 +12,7 @@ steps: archive_format: "gzip" # filesystem_cache_root: "/tmp/cache" mount: - - '/opt/android-sdk-linux' - - '/var/cache/apt/archives/' + - '/var/cache/apt/' volumes: - name: cache path: /tmp/cache @@ -39,8 +38,7 @@ steps: archive_format: "gzip" # filesystem_cache_root: "/tmp/cache" mount: - - '/opt/android-sdk-linux' - - '/var/cache/apt/archives/' + - '/var/cache/apt/' volumes: - name: cache path: /tmp/cache diff --git a/Dockerfile b/Dockerfile index 38aeb11..5fb7799 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,24 +14,22 @@ ENV PATH "${PATH}:${ANDROID_HOME}/platform-tools" ENV PATH "${PATH}:${ANDROID_HOME}/emulator" ENV PATH "${PATH}:${ANDROID_HOME}/bin" -RUN dpkg --add-architecture i386 && \ - apt-get update -yqq && \ - apt-get install -y curl expect git libc6:i386 libgcc1:i386 libncurses5:i386 libstdc++6:i386 zlib1g:i386 openjdk-19-jdk-headless wget unzip vim qemu-kvm libvirt-daemon-system libvirt-clients bridge-utils && \ - apt-get clean - -RUN groupadd android && useradd -d /opt/android-sdk-linux -g android android - COPY tools /opt/tools COPY licenses /opt/licenses WORKDIR /opt/android-sdk-linux -RUN /opt/tools/entrypoint.sh built-in - -RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "cmdline-tools;latest" -RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "build-tools;33.0.2" -RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platform-tools" -RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platforms;android-33" -RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "system-images;android-33;google_apis;x86_64" +RUN --mount=type=cache,target=/var/cache/apt && \ + dpkg --add-architecture i386 && \ + apt-get update -yqq && \ + apt-get install -y curl expect git libc6:i386 libgcc1:i386 libncurses5:i386 libstdc++6:i386 zlib1g:i386 openjdk-19-jdk-headless wget unzip vim qemu-kvm libvirt-daemon-system libvirt-clients bridge-utils && \ + apt-get clean && \ + groupadd android && useradd -d /opt/android-sdk-linux -g android android && \ + /opt/tools/entrypoint.sh built-in && \ + /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "cmdline-tools;latest" && \ + /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "build-tools;33.0.2" && \ + /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platform-tools" && \ + /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platforms;android-33" && \ + /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "system-images;android-33;google_apis;x86_64" CMD /opt/tools/entrypoint.sh built-in From b0762d52f9b21ccb7593dfaa1e633ed70884a104 Mon Sep 17 00:00:00 2001 From: Amab Date: Sat, 15 Apr 2023 12:48:14 +0200 Subject: [PATCH 4/4] Disable Drone CI cache --- .drone.yml | 35 ----------------------------------- Dockerfile | 3 +-- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6373bc4..bfcbdb1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,21 +2,6 @@ kind: pipeline name: default steps: - - name: restore-cache-with-filesystem - image: meltwater/drone-cache:latest - pull: true - settings: - backend: "filesystem" - restore: true - cache_key: "volume" - archive_format: "gzip" - # filesystem_cache_root: "/tmp/cache" - mount: - - '/var/cache/apt/' - volumes: - - name: cache - path: /tmp/cache - - name: docker image: plugins/docker:linux-amd64 settings: @@ -27,23 +12,3 @@ steps: from_secret: docker_password repo: git.cuernodehipnos.es/marown/android-sdk-docker tags: latest - - - name: rebuild-cache-with-filesystem - image: meltwater/drone-cache:latest - pull: true - settings: - backend: "filesystem" - rebuild: true - cache_key: "volume" - archive_format: "gzip" - # filesystem_cache_root: "/tmp/cache" - mount: - - '/var/cache/apt/' - volumes: - - name: cache - path: /tmp/cache - -volumes: - - name: cache - host: - path: /share/CACHEDEV1_DATA/homes/admin/drone/cache/ diff --git a/Dockerfile b/Dockerfile index 5fb7799..eb510d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,7 @@ COPY licenses /opt/licenses WORKDIR /opt/android-sdk-linux -RUN --mount=type=cache,target=/var/cache/apt && \ - dpkg --add-architecture i386 && \ +RUN dpkg --add-architecture i386 && \ apt-get update -yqq && \ apt-get install -y curl expect git libc6:i386 libgcc1:i386 libncurses5:i386 libstdc++6:i386 zlib1g:i386 openjdk-19-jdk-headless wget unzip vim qemu-kvm libvirt-daemon-system libvirt-clients bridge-utils && \ apt-get clean && \