From b132876f152ee0efc7aa8d379f093ae3da8d7133 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan@faked.org>
Date: Sat, 13 Feb 2021 22:15:07 +0100
Subject: [PATCH] fix path, unduplicate packages, use support cmdline-tools
version
---
Dockerfile | 19 ++++++++++---------
packages.txt | 4 +---
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 76dbe42..d1d7e7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
FROM ubuntu:20.04
MAINTAINER Jan Grewe <jan@faked.org>
-ENV VERSION_TOOLS "6987402"
+ENV VERSION_TOOLS "6858069"
ENV ANDROID_SDK_ROOT "/sdk"
# Keep alias for compatibility
ENV ANDROID_HOME "${ANDROID_SDK_ROOT}"
-ENV PATH "$PATH:${ANDROID_SDK_ROOT}/tools"
+ENV PATH "$PATH:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools"
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get -qq update \
@@ -30,20 +30,21 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
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 \
+RUN curl -s https://dl.google.com/android/repository/commandlinetools-linux-${VERSION_TOOLS}_latest.zip > /cmdline-tools.zip \
&& mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools \
- && unzip /tools.zip -d ${ANDROID_SDK_ROOT}/cmdline-tools \
- && rm -v /tools.zip
+ && unzip /cmdline-tools.zip -d ${ANDROID_SDK_ROOT}/cmdline-tools \
+ && mv ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest \
+ && rm -v /cmdline-tools.zip
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
+ && yes | sdkmanager --licenses >/dev/null
-ADD packages.txt /sdk
RUN mkdir -p /root/.android \
&& touch /root/.android/repositories.cfg \
- && ${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --update
+ && sdkmanager --update
+ADD packages.txt /sdk
RUN while read -r package; do PACKAGES="${PACKAGES}${package} "; done < /sdk/packages.txt \
- && ${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} ${PACKAGES}
+ && sdkmanager ${PACKAGES}
diff --git a/packages.txt b/packages.txt
index 8b49a29..82af47c 100644
--- a/packages.txt
+++ b/packages.txt
@@ -1,9 +1,7 @@
add-ons;addon-google_apis-google-24
-build-tools
+build-tools;30.0.3
extras;android;m2repository
extras;google;m2repository
extras;google;google_play_services
extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2
-extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2
-platform-tools
platforms;android-30
--
GitLab