Update Dockerfile

This commit is contained in:
Oskar 2021-10-24 00:14:00 +02:00 committed by GitHub
parent 75d3e28a34
commit f4e62bd1dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 19 deletions

View File

@ -1,3 +1,5 @@
FROM medzik/android-sdk:archlinux AS sdk
FROM ubuntu:focal
USER root
@ -11,9 +13,6 @@ ENV LC_ALL "en_US.UTF-8"
ENV LANGUAGE "en_US:en"
ENV PATH "${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/emulator:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${PATH}"
# comes from https://developer.android.com/studio/#command-tools
ENV ANDROID_SDK_TOOLS_FILE_NAME "commandlinetools-linux-7583922_latest.zip"
RUN apt-get update \
&& apt-get install -qq -y --no-install-recommends \
apt-transport-https \
@ -46,31 +45,18 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
COPY --chown=root --from=sdk /opt/android-sdk ${ANDROID_HOME}
RUN set -o xtrace \
&& cd /opt \
&& sh -c 'echo "en_US.UTF-8 UTF-8" > /etc/locale.gen' \
&& locale-gen \
&& update-locale LANG=en_US.UTF-8 \
&& wget -q https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_FILE_NAME} -O android-sdk-tools.zip \
&& mkdir -p ${ANDROID_HOME}/cmdline-tools/ \
&& unzip -q android-sdk-tools.zip -d ${ANDROID_HOME}/cmdline-tools/ \
&& rm android-sdk-tools.zip \
&& mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest \
&& chown -R root:root $ANDROID_HOME \
&& echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers \
&& yes | sdkmanager --licenses \
&& wget -O /usr/bin/android-wait-for-emulator https://raw.githubusercontent.com/travis-ci/travis-cookbooks/master/community-cookbooks/android-sdk/files/default/android-wait-for-emulator \
&& chmod +x /usr/bin/android-wait-for-emulator \
&& touch /root/.android/repositories.cfg
ENV ANDROID_PLATFORM_VERSION 30
ENV ANDROID_BUILD_TOOLS_VERSION 30.0.2
RUN yes | sdkmanager \
"platform-tools" \
"platforms;android-$ANDROID_PLATFORM_VERSION" \
"build-tools;$ANDROID_BUILD_TOOLS_VERSION" \
"cmdline-tools;latest"
&& chmod +x /usr/bin/android-wait-for-emulator
RUN mkdir -p /root/.android \
&& touch /root/.android/repositories.cfg