Merge pull request #248 from DataDog/nogorodnikov/update-ndk-to-25-in…

…-docker-image Install NDK 25.1.8937393 in the Docker image
DataDog · Apr 15, 2024 · 81aace0 · 81aace0
2 parents 924006b + e1f04f3
commit 81aace0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ include:
 # SETUP
 
 variables:
-  CURRENT_CI_IMAGE: "6"
+  CURRENT_CI_IMAGE: "7"
   CI_IMAGE_DOCKER: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/dd-sdk-android-gradle-plugin:$CURRENT_CI_IMAGE
   GIT_DEPTH: 5
 
@@ -35,8 +35,7 @@ ci-image:
   tags: [ "arch:amd64" ]
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
   script:
-    - docker build --tag $CI_IMAGE_DOCKER -f Dockerfile.gitlab .
-    - docker push $CI_IMAGE_DOCKER
+    - docker buildx build --tag $CI_IMAGE_DOCKER -f Dockerfile.gitlab --push .
 
 # SECURITY
 

diff --git a/Dockerfile.gitlab b/Dockerfile.gitlab
@@ -28,7 +28,7 @@ ENV GRADLE_VERSION 8.6
 ENV ANDROID_COMPILE_SDK 34
 ENV ANDROID_BUILD_TOOLS 34.0.0
 ENV ANDROID_SDK_TOOLS 11076708
-ENV NDK_VERSION 21.3.6528147
+ENV NDK_VERSION 25.1.8937393
 ENV CMAKE_VERSION 3.22.1