Skip to content

Commit dc69689

Browse files
yunhanw-googlepimpalemahesh
authored andcommitted
Fix android docker image (#37348)
1 parent 974f56a commit dc69689

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
105 : Upgrade android docker with new kotlin/gradle
1+
106 : Upgrade android docker with java 17 and adjust the location for android cmdline tool

integrations/docker/images/stage-2/chip-build-java/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh
66
RUN set -x \
77
&& apt-get update \
88
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy \
9-
openjdk-11-jdk \
9+
openjdk-17-jdk \
1010
&& rm -rf /var/lib/apt/lists/ \
1111
&& : # last line
1212

@@ -20,4 +20,4 @@ RUN set -x \
2020
&& : # last line
2121

2222
ENV PATH $PATH:/usr/lib/kotlinc/bin
23-
ENV JAVA_PATH=/usr/lib/jvm/java-11-openjdk-amd64
23+
ENV JAVA_PATH=/usr/lib/jvm/java-17-openjdk-amd64

integrations/docker/images/stage-3/chip-build-android/Dockerfile

+7-2
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,16 @@ RUN set -x \
2727
&& : # last line
2828

2929
# Download and install android command line tool (for installing `sdkmanager`)
30+
# We need create latest folder inide cmdline-tools, since latest android commandline tool looks for this latest folder
31+
# when running sdkmanager --licenses
3032
RUN set -x \
3133
&& wget -O /tmp/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip \
3234
&& cd /opt/android/sdk \
33-
&& unzip /tmp/cmdline-tools.zip \
34-
&& rm -f /tmp/cmdline-tools.zip \
35+
&& mkdir -p temp \
36+
&& unzip /tmp/cmdline-tools.zip -d temp \
37+
&& mkdir -p cmdline-tools/latest \
38+
&& cp -rf temp/cmdline-tools/* cmdline-tools/latest \
39+
&& rm -rf temp \
3540
&& test -d /opt/android/sdk/cmdline-tools \
3641
&& : # last line
3742

0 commit comments

Comments
 (0)