Optimize Dockerfile
This commit is contained in:
parent
1a4e7c9a39
commit
6004971bae
|
@ -12,8 +12,7 @@ steps:
|
||||||
archive_format: "gzip"
|
archive_format: "gzip"
|
||||||
# filesystem_cache_root: "/tmp/cache"
|
# filesystem_cache_root: "/tmp/cache"
|
||||||
mount:
|
mount:
|
||||||
- '/opt/android-sdk-linux'
|
- '/var/cache/apt/'
|
||||||
- '/var/cache/apt/archives/'
|
|
||||||
volumes:
|
volumes:
|
||||||
- name: cache
|
- name: cache
|
||||||
path: /tmp/cache
|
path: /tmp/cache
|
||||||
|
@ -39,8 +38,7 @@ steps:
|
||||||
archive_format: "gzip"
|
archive_format: "gzip"
|
||||||
# filesystem_cache_root: "/tmp/cache"
|
# filesystem_cache_root: "/tmp/cache"
|
||||||
mount:
|
mount:
|
||||||
- '/opt/android-sdk-linux'
|
- '/var/cache/apt/'
|
||||||
- '/var/cache/apt/archives/'
|
|
||||||
volumes:
|
volumes:
|
||||||
- name: cache
|
- name: cache
|
||||||
path: /tmp/cache
|
path: /tmp/cache
|
||||||
|
|
26
Dockerfile
26
Dockerfile
|
@ -14,24 +14,22 @@ ENV PATH "${PATH}:${ANDROID_HOME}/platform-tools"
|
||||||
ENV PATH "${PATH}:${ANDROID_HOME}/emulator"
|
ENV PATH "${PATH}:${ANDROID_HOME}/emulator"
|
||||||
ENV PATH "${PATH}:${ANDROID_HOME}/bin"
|
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 tools /opt/tools
|
||||||
COPY licenses /opt/licenses
|
COPY licenses /opt/licenses
|
||||||
|
|
||||||
WORKDIR /opt/android-sdk-linux
|
WORKDIR /opt/android-sdk-linux
|
||||||
|
|
||||||
RUN /opt/tools/entrypoint.sh built-in
|
RUN --mount=type=cache,target=/var/cache/apt && \
|
||||||
|
dpkg --add-architecture i386 && \
|
||||||
RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "cmdline-tools;latest"
|
apt-get update -yqq && \
|
||||||
RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "build-tools;33.0.2"
|
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 && \
|
||||||
RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platform-tools"
|
apt-get clean && \
|
||||||
RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platforms;android-33"
|
groupadd android && useradd -d /opt/android-sdk-linux -g android android && \
|
||||||
RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "system-images;android-33;google_apis;x86_64"
|
/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
|
CMD /opt/tools/entrypoint.sh built-in
|
||||||
|
|
Loading…
Reference in New Issue
Block a user