From 76b28a02144b190d0a2285cc11206478e8c1dbf1 Mon Sep 17 00:00:00 2001 From: Nikita Ogorodnikov Date: Fri, 12 Apr 2024 09:01:25 +0200 Subject: [PATCH] Migrate to GBI images --- .gitlab-ci.yml | 4 ++-- Dockerfile.gitlab | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce9f7f03..0330ab32 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ include: # SETUP variables: - CURRENT_CI_IMAGE: "5" + CURRENT_CI_IMAGE: "6" CI_IMAGE_DOCKER: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/dd-sdk-android-gradle-plugin:$CURRENT_CI_IMAGE GIT_DEPTH: 5 @@ -30,7 +30,7 @@ ci-image: when: manual except: [ tags, schedules ] tags: [ "runner:docker" ] - image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:20.10.13 + 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 diff --git a/Dockerfile.gitlab b/Dockerfile.gitlab index 9d9dc399..c7c53c3b 100644 --- a/Dockerfile.gitlab +++ b/Dockerfile.gitlab @@ -1,4 +1,4 @@ -FROM registry.ddbuild.io/images/mirror/ubuntu:20.04 +FROM registry.ddbuild.io/images/docker:24.0.4-gbi-focal ENV DEBIAN_FRONTEND=noninteractive @@ -70,7 +70,7 @@ RUN \ echo y | android-sdk-linux/cmdline-tools/latest/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null && \ echo y | android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --install "ndk;${NDK_VERSION}" >/dev/null && \ echo y | android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --install "cmake;${CMAKE_VERSION}" >/dev/null && \ - yes | android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --licenses + (yes || true) | android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --licenses RUN set -x \ && curl -OL https://s3.amazonaws.com/dd-package-public/dd-package.deb && dpkg -i dd-package.deb && rm dd-package.deb \