Skip to content

Commit

Permalink
[docker:android-ndk-r22-jdk17] Added 'Accept all Android SDK liceses'…
Browse files Browse the repository at this point in the history
… step to android-ndk-r22-jdk17 docker image. Removed obsolete packages.

Circle CI docker image update.
  • Loading branch information
tomaszrybakiewicz committed Oct 1, 2024
1 parent 13ac33e commit f6cd17f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
9 changes: 3 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@ version: 2

jobs:
build:
working_directory: /app
working_directory: ~/app
docker:
- image: docker:18.05.0-ce-git
- image: cimg/base:2024.10
steps:
- checkout
- run:
name: Install dependencies
command: apk add --no-progress bash
- setup_remote_docker:
version: 18.05.0-ce
version: docker24
- run:
name: Log in to Docker Hub
command: docker login -u mbgl -p ${DOCKER_PASS}
Expand Down
6 changes: 4 additions & 2 deletions images/android-ndk-r22-jdk17
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN set -eu \
RUN set -eu \
&& mkdir -p "${ANDROID_HOME}/licenses" \
&& echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "${ANDROID_HOME}/licenses/android-sdk-license" \
&& tools/bin/sdkmanager \
&& tools/bin/sdkmanager --include_obsolete \
"--sdk_root=${ANDROID_HOME}" \
"platform-tools" \
"build-tools;28.0.3" \
Expand All @@ -50,8 +50,10 @@ RUN set -eu \
"platforms;android-28" \
"extras;android;m2repository" \
"extras;google;m2repository" \
"extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" \
"cmake;3.10.2.4988404" \
&& rm -rf "${ANDROID_HOME}/licenses"

# Accept all Android SDK licenses
RUN yes | tools/bin/sdkmanager "--sdk_root=${ANDROID_HOME}" --licenses

WORKDIR /src

0 comments on commit f6cd17f

Please sign in to comment.