Skip to content

Commit b9ea45f

Browse files
authored
bump buck to 2020.05.14.01, NDK to 20.1.5948944 (#77)
1 parent 79e8d68 commit b9ea45f

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ LABEL Description="This image provides a base Android development environment fo
55
ENV DEBIAN_FRONTEND=noninteractive
66

77
# set default build arguments
8-
ARG SDK_VERSION=sdk-tools-linux-4333796.zip
8+
ARG SDK_VERSION=commandlinetools-linux-6514223_latest.zip
99
ARG ANDROID_BUILD_VERSION=29
1010
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
1313
ARG NODE_VERSION=12.x
1414
ARG WATCHMAN_VERSION=4.9.0
1515

@@ -19,7 +19,7 @@ ENV ANDROID_HOME=/opt/android
1919
ENV ANDROID_SDK_HOME=${ANDROID_HOME}
2020
ENV ANDROID_NDK=${ANDROID_HOME}/ndk/$NDK_VERSION
2121

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}
2323

2424
# Install system dependencies
2525
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 \
3333
openjdk-8-jdk \
3434
gnupg2 \
3535
python \
36+
python3-distutils \
3637
openssh-client \
3738
unzip \
3839
&& gem install bundler \
@@ -54,8 +55,8 @@ RUN curl -sS -L https://github.com/facebook/buck/releases/download/v${BUCK_VERSI
5455
# Full reference at https://dl.google.com/android/repository/repository2-1.xml
5556
# download and unpack android
5657
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 \
5960
&& rm /tmp/sdk.zip \
6061
&& yes | sdkmanager --licenses \
6162
&& yes | sdkmanager "platform-tools" \
@@ -67,4 +68,4 @@ RUN curl -sS https://dl.google.com/android/repository/${SDK_VERSION} -o /tmp/sdk
6768
"system-images;android-19;google_apis;armeabi-v7a" \
6869
"extras;android;m2repository" \
6970
"ndk;$NDK_VERSION" \
70-
&& rm -rf /opt/android/.android
71+
&& rm -rf ${ANDROID_HOME}/.android

0 commit comments

Comments
 (0)