Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to GBI images #246

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Migrate to GBI images #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.gitlab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 \
Expand Down
Loading