From a120cfa01b315cdff02420f56a9147ba97d9c88a Mon Sep 17 00:00:00 2001
From: Jens Finkhaeuser <jens@finkhaeuser.de>
Date: Sat, 27 Jun 2020 15:48:34 +0200
Subject: [PATCH] Fix #52
---
Dockerfile | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index f5ca546..1f23e47 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,8 +10,10 @@ MAINTAINER Jan Grewe <jan@faked.org>
ENV VERSION_TOOLS "6200805"
-ENV ANDROID_HOME "/sdk"
-ENV PATH "$PATH:${ANDROID_HOME}/tools"
+ENV ANDROID_SDK_ROOT "/sdk"
+# Keep alias for compatibility
+ENV ANDROID_HOME "${ANDROID_SDK_ROOT}"
+ENV PATH "$PATH:${ANDROID_SDK_ROOT}/tools"
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get -qq update \
@@ -36,19 +38,19 @@ RUN rm -f /etc/ssl/certs/java/cacerts; \
/var/lib/dpkg/info/ca-certificates-java.postinst configure
RUN curl -s https://dl.google.com/android/repository/commandlinetools-linux-${VERSION_TOOLS}_latest.zip > /tools.zip \
- && mkdir -p ${ANDROID_HOME}/cmdline-tools \
- && unzip /tools.zip -d ${ANDROID_HOME}/cmdline-tools \
+ && mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools \
+ && unzip /tools.zip -d ${ANDROID_SDK_ROOT}/cmdline-tools \
&& rm -v /tools.zip
-RUN mkdir -p $ANDROID_HOME/licenses/ \
- && echo "8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > $ANDROID_HOME/licenses/android-sdk-license \
- && echo "84831b9409646a918e30573bab4c9c91346d8abd\n504667f4c0de7af1a06de9f4b1727b84351f2910" > $ANDROID_HOME/licenses/android-sdk-preview-license \
- && yes | ${ANDROID_HOME}/cmdline-tools/tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} --licenses >/dev/null
+RUN mkdir -p $ANDROID_SDK_ROOT/licenses/ \
+ && echo "8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > $ANDROID_SDK_ROOT/licenses/android-sdk-license \
+ && echo "84831b9409646a918e30573bab4c9c91346d8abd\n504667f4c0de7af1a06de9f4b1727b84351f2910" > $ANDROID_SDK_ROOT/licenses/android-sdk-preview-license \
+ && yes | ${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --licenses >/dev/null
ADD packages.txt /sdk
RUN mkdir -p /root/.android \
&& touch /root/.android/repositories.cfg \
- && ${ANDROID_HOME}/cmdline-tools/tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} --update
+ && ${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --update
RUN while read -r package; do PACKAGES="${PACKAGES}${package} "; done < /sdk/packages.txt \
- && ${ANDROID_HOME}/cmdline-tools/tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} ${PACKAGES}
+ && ${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} ${PACKAGES}
--
GitLab