Marown/android-sdk-docker
Marown
/
android-sdk-docker
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize Dockerfile
continuous-integration/drone/push Build is failing Details
continuous-integration/drone/pr Build is failing Details

This commit is contained in:
Amab 2023-04-15 12:39:39 +02:00
parent 1a4e7c9a39
commit 6004971bae
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.yml
View File

@ -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

26
Dockerfile
View File

@ -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