Skip to content

Commit f6cd17f

Browse files
committedOct 1, 2024·
[docker:android-ndk-r22-jdk17] Added 'Accept all Android SDK liceses' step to android-ndk-r22-jdk17 docker image. Removed obsolete packages.
Circle CI docker image update.
1 parent 13ac33e commit f6cd17f

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed
 

‎.circleci/config.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ version: 2
22

33
jobs:
44
build:
5-
working_directory: /app
5+
working_directory: ~/app
66
docker:
7-
- image: docker:18.05.0-ce-git
7+
- image: cimg/base:2024.10
88
steps:
99
- checkout
10-
- run:
11-
name: Install dependencies
12-
command: apk add --no-progress bash
1310
- setup_remote_docker:
14-
version: 18.05.0-ce
11+
version: docker24
1512
- run:
1613
name: Log in to Docker Hub
1714
command: docker login -u mbgl -p ${DOCKER_PASS}

‎images/android-ndk-r22-jdk17

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN set -eu \
3232
RUN set -eu \
3333
&& mkdir -p "${ANDROID_HOME}/licenses" \
3434
&& echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "${ANDROID_HOME}/licenses/android-sdk-license" \
35-
&& tools/bin/sdkmanager \
35+
&& tools/bin/sdkmanager --include_obsolete \
3636
"--sdk_root=${ANDROID_HOME}" \
3737
"platform-tools" \
3838
"build-tools;28.0.3" \
@@ -50,8 +50,10 @@ RUN set -eu \
5050
"platforms;android-28" \
5151
"extras;android;m2repository" \
5252
"extras;google;m2repository" \
53-
"extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" \
5453
"cmake;3.10.2.4988404" \
5554
&& rm -rf "${ANDROID_HOME}/licenses"
5655

56+
# Accept all Android SDK licenses
57+
RUN yes | tools/bin/sdkmanager "--sdk_root=${ANDROID_HOME}" --licenses
58+
5759
WORKDIR /src

0 commit comments

Comments
 (0)
Please sign in to comment.