From 8f1067fd6a1208e8fed2a6ae85ad92f1e681294a Mon Sep 17 00:00:00 2001 From: roxt Date: Wed, 31 Jul 2024 14:48:57 +0300 Subject: [PATCH] Add graddle version selection --- project-mybook-android-build/Dockerfile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/project-mybook-android-build/Dockerfile b/project-mybook-android-build/Dockerfile index fadde55..141b73d 100644 --- a/project-mybook-android-build/Dockerfile +++ b/project-mybook-android-build/Dockerfile @@ -1,4 +1,5 @@ ARG PARENT_IMAGE_TAG=git-branch-master +ARG GRADDLE_VERSION="8.4" FROM ci-mybook-android:android-sdk-$PARENT_IMAGE_TAG @@ -8,14 +9,17 @@ RUN apt update && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN sdkmanager "build-tools;34.0.0" 1>/dev/null -RUN sdkmanager "emulator" 1>/dev/null -RUN sdkmanager "extras;android;m2repository" 1>/dev/null -RUN sdkmanager "extras;google;m2repository" 1>/dev/null +# setup gradle version +RUN gradle wrapper --gradle-version ${GRADDLE_VERSION} --distribution-type all -RUN sdkmanager "platforms;android-34" 1>/dev/null +# Configure sdk +RUN sdkmanager "build-tools;34.0.0" 1>/dev/null && \ + sdkmanager "emulator" 1>/dev/null && \ + sdkmanager "extras;android;m2repository" 1>/dev/null && \ + sdkmanager "extras;google;m2repository" 1>/dev/null && \ + sdkmanager "platforms;android-34" 1>/dev/null && \ + sdkmanager "cmake;3.10.2.4988404" 1>/dev/null && \ + sdkmanager "ndk;21.3.6528147" 1>/dev/null \ -RUN sdkmanager "cmake;3.10.2.4988404" 1>/dev/null -RUN sdkmanager "ndk;21.3.6528147" 1>/dev/null ENV ANDROID_NDK $ANDROID_HOME/ndk-bundle