Skip to content

Commit 1cda241

Browse files
chakrihackerSubramanya Chakravarthy
and
Subramanya Chakravarthy
authored
Update cmake to 3.18 (#111)
Co-authored-by: Subramanya Chakravarthy <[email protected]>
1 parent 96ea6a4 commit 1cda241

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ 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=commandlinetools-linux-6609375_latest.zip
8+
ARG SDK_VERSION=commandlinetools-linux-7302050_latest.zip
99
ARG ANDROID_BUILD_VERSION=30
1010
ARG ANDROID_TOOLS_VERSION=30.0.3
1111
ARG BUCK_VERSION=2020.10.21.01
@@ -20,7 +20,7 @@ ENV ANDROID_SDK_HOME=${ANDROID_HOME}
2020
ENV ANDROID_NDK=${ANDROID_HOME}/ndk/$NDK_VERSION
2121
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
2222

23-
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+
ENV PATH=${ANDROID_NDK}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/emulator:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:/opt/buck/bin/:${PATH}
2424

2525
# Install system dependencies
2626
RUN apt update -qq && apt install -qq -y --no-install-recommends \
@@ -67,13 +67,14 @@ RUN curl -sS -L https://github.com/facebook/buck/releases/download/v${BUCK_VERSI
6767
RUN curl -sS https://dl.google.com/android/repository/${SDK_VERSION} -o /tmp/sdk.zip \
6868
&& mkdir -p ${ANDROID_HOME}/cmdline-tools \
6969
&& unzip -q -d ${ANDROID_HOME}/cmdline-tools /tmp/sdk.zip \
70+
&& mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest \
7071
&& rm /tmp/sdk.zip \
7172
&& yes | sdkmanager --licenses \
7273
&& yes | sdkmanager "platform-tools" \
7374
"emulator" \
7475
"platforms;android-$ANDROID_BUILD_VERSION" \
7576
"build-tools;$ANDROID_TOOLS_VERSION" \
76-
"cmake;3.10.2.4988404" \
77+
"cmake;3.18.1" \
7778
"system-images;android-21;google_apis;armeabi-v7a" \
7879
"ndk;$NDK_VERSION" \
7980
&& rm -rf ${ANDROID_HOME}/.android

0 commit comments

Comments
 (0)