Skip to content

Commit 5cce0e2

Browse files
committed
Rework Docker image computation
Lots has changed here as we no longer produce Docker images with both Ruby and Go for certain combinations.
1 parent db196c5 commit 5cce0e2

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

.gitlab-ci.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,22 @@ stages:
1818
variables:
1919
FF_USE_FASTZIP: "true"
2020
TRANSFER_METER_FREQUENCY: "1s"
21-
DOCKER_VERSION: "20.10.15"
2221
BUNDLE_FROZEN: "true"
23-
GO_VERSION: "1.24"
2422
GOPATH: $CI_PROJECT_DIR/.GOPATH
2523
DEBIAN_VERSION: "bookworm"
26-
RUBY_VERSION: "3.3.7"
2724
BUNDLE_PATH: vendor/ruby
2825
POLICY: pull
2926
CI_DEBUG_SERVICES: "true"
27+
DOCKER_VERSION: "20.10.15"
28+
GO_VERSION: "1.24"
29+
RUBY_VERSION: "3.3.7"
3030
RUST_VERSION: "1.73"
31-
UBI_VERSION: "8.6"
32-
IMAGE_TAG: "rubygems-3.5-git-2.45-exiftool-12.60"
31+
UBI_VERSION: "9.5"
3332
GITLAB_ADVANCED_SAST_ENABLED: "true"
33+
IMAGE_TAG: "rubygems-3.5-git-2.45-lfs-2.9-chrome-123-yarn-1.22-graphicsmagick-1.3.36"
34+
DEFAULT_IMAGE: "registry.gitlab.com/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}-rust-${RUST_VERSION}-node-20.12-postgresql-16:${IMAGE_TAG}"
35+
FIPS_IMAGE_TAG: "git-2.45"
36+
FIPS_IMAGE: "registry.gitlab.com/gitlab-org/gitlab-build-images/ubi-${UBI_VERSION}-golang-${GO_VERSION}-rust-${RUST_VERSION}:${FIPS_IMAGE_TAG}"
3437

3538
workflow:
3639
rules: &workflow_rules # For merge requests, create a pipeline.
@@ -48,7 +51,7 @@ workflow:
4851
- "**/*.go"
4952

5053
default:
51-
image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}-rust-${RUST_VERSION}:${IMAGE_TAG}
54+
image: ${DEFAULT_IMAGE}
5255
tags:
5356
- gitlab-org
5457

@@ -175,7 +178,7 @@ tests_without_cgo:
175178
- make verify test_fancy
176179

177180
tests:fips:
178-
image: registry.gitlab.com/gitlab-org/gitlab-build-images/ubi-${UBI_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}-rust-${RUST_VERSION}:${IMAGE_TAG}
181+
image: ${FIPS_IMAGE}
179182
extends:
180183
- .cached-job
181184
- .test-job

0 commit comments

Comments
 (0)