From bdefe18043d4ceec1716eea5f7c2cc478008cc24 Mon Sep 17 00:00:00 2001
From: Nikita Ogorodnikov <nikita.ogorodnikov@datadoghq.com>
Date: Mon, 15 Apr 2024 15:46:11 +0200
Subject: [PATCH 1/2] Install NDK 25.1.8937393 in the Docker image

---
 .gitlab-ci.yml    | 2 +-
 Dockerfile.gitlab | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b48e2667..5a3025e1 100644
--- 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
 
diff --git a/Dockerfile.gitlab b/Dockerfile.gitlab
index c7c53c3b..c6df2920 100644
--- 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
 
 

From e1f04f380bfe7552541c9238ce7bf664848fef1b Mon Sep 17 00:00:00 2001
From: Nikita Ogorodnikov <nikita.ogorodnikov@datadoghq.com>
Date: Mon, 15 Apr 2024 16:04:38 +0200
Subject: [PATCH 2/2] Fix Docker image creation

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a3025e1..addb83e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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