@@ -5,11 +5,11 @@ LABEL Description="This image provides a base Android development environment fo
5
5
ENV DEBIAN_FRONTEND=noninteractive
6
6
7
7
# set default build arguments
8
- ARG SDK_VERSION=sdk-tools- linux-4333796 .zip
8
+ ARG SDK_VERSION=commandlinetools- linux-6514223_latest .zip
9
9
ARG ANDROID_BUILD_VERSION=29
10
10
ARG ANDROID_TOOLS_VERSION=29.0.3
11
- ARG BUCK_VERSION=2019.10.17 .01
12
- ARG NDK_VERSION=20.0.5594570
11
+ ARG BUCK_VERSION=2020.05.14 .01
12
+ ARG NDK_VERSION=20.1.5948944
13
13
ARG NODE_VERSION=12.x
14
14
ARG WATCHMAN_VERSION=4.9.0
15
15
@@ -19,7 +19,7 @@ ENV ANDROID_HOME=/opt/android
19
19
ENV ANDROID_SDK_HOME=${ANDROID_HOME}
20
20
ENV ANDROID_NDK=${ANDROID_HOME}/ndk/$NDK_VERSION
21
21
22
- ENV PATH=${ANDROID_NDK}:${ANDROID_HOME}/emulator:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin :${ANDROID_HOME}/platform- tools:/opt/buck/bin/:${PATH}
22
+ ENV PATH=${ANDROID_NDK}:${ANDROID_HOME}/cmdline-tools/tools/bin:${ANDROID_HOME}/ emulator:${ANDROID_HOME}/platform- tools:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin :/opt/buck/bin/:${PATH}
23
23
24
24
# Install system dependencies
25
25
RUN apt update -qq && apt install -qq -y --no-install-recommends \
@@ -33,6 +33,7 @@ RUN apt update -qq && apt install -qq -y --no-install-recommends \
33
33
openjdk-8-jdk \
34
34
gnupg2 \
35
35
python \
36
+ python3-distutils \
36
37
openssh-client \
37
38
unzip \
38
39
&& gem install bundler \
@@ -54,8 +55,8 @@ RUN curl -sS -L https://github.com/facebook/buck/releases/download/v${BUCK_VERSI
54
55
# Full reference at https://dl.google.com/android/repository/repository2-1.xml
55
56
# download and unpack android
56
57
RUN curl -sS https://dl.google.com/android/repository/${SDK_VERSION} -o /tmp/sdk.zip \
57
- && mkdir ${ANDROID_HOME} \
58
- && unzip -q -d ${ANDROID_HOME} /tmp/sdk.zip \
58
+ && mkdir -p ${ANDROID_HOME}/cmdline-tools \
59
+ && unzip -q -d ${ANDROID_HOME}/cmdline-tools /tmp/sdk.zip \
59
60
&& rm /tmp/sdk.zip \
60
61
&& yes | sdkmanager --licenses \
61
62
&& yes | sdkmanager "platform-tools" \
@@ -67,4 +68,4 @@ RUN curl -sS https://dl.google.com/android/repository/${SDK_VERSION} -o /tmp/sdk
67
68
"system-images;android-19;google_apis;armeabi-v7a" \
68
69
"extras;android;m2repository" \
69
70
"ndk;$NDK_VERSION" \
70
- && rm -rf /opt/android /.android
71
+ && rm -rf ${ANDROID_HOME} /.android
0 commit comments