From 037735c6935ab9c10e6c5432bb1be1938ba4b802 Mon Sep 17 00:00:00 2001 From: Dilawar Singh Date: Sat, 20 Jan 2024 17:26:04 +0530 Subject: [PATCH 1/2] ci: Fixes to ci --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 06d6365..89e8426 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,9 @@ RUN wget https://dl.google.com/android/repository/commandlinetools-linux-9477386 # sdkmanager expect this path scheme RUN mv $ANDROID_HOME/cmdline-tools/cmdline-tools $ANDROID_HOME/cmdline-tools/latest ENV PATH "$ANDROID_HOME/cmdline-tools/latest/bin:$PATH" -RUN sdkmanager "build-tools;30.0.3" "emulator" "ndk;25.2.9519653" "patcher;v4" "platform-tools" "platforms;android-33" +RUN yes | sdkmanager --licenses + +RUN sdkmanager "build-tools;30.0.3" "emulator" "ndk;25.2.9519653" "platform-tools" "platforms;android-34" COPY ./.ci/build_inside_docker.sh /root/build_inside_docker.sh RUN ln -s /usr/bin/python3 /usr/bin/python From af85f851ee36f7b73ca8ac4c97b9841c57f6428c Mon Sep 17 00:00:00 2001 From: Dilawar Singh Date: Sat, 20 Jan 2024 17:39:39 +0530 Subject: [PATCH 2/2] chore: Updated tagged image --- docker-compose.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2396a97..3bffb0b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,7 @@ services: - app: - image: subcom/rust_android - build: . + android: + image: subcom/rust_android:2024.01.20 + build: + context: . volumes: - .:/app