NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-11 02:52:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'andrey-bump-docker-version' into 'master'

Browse source 
Bump docker version in e2e images

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/718

Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>
This commit is contained in:
Stan Hu 2023-08-29 17:00:53 +00:00
commit 4ed4b5fde8
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -35,7 +35,7 @@ stages:
variables: variables:
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375
BASE_BUILD_REGISTRY_IMAGE: registry.gitlab.com/gitlab-org/gitlab-build-images BASE_BUILD_REGISTRY_IMAGE: registry.gitlab.com/gitlab-org/gitlab-build-images
DOCKER_VERSION: "23.0.1" DOCKER_VERSION: "24.0.5"
dont-interrupt-me: dont-interrupt-me:
extends: .dont-interrupt-me extends: .dont-interrupt-me

2
.gitlab/ci/definitions.yml
View file

@ -1,7 +1,7 @@
.install-qemu: .install-qemu:
timeout: 4 hours # builds with emulation can take a long time to complete timeout: 4 hours # builds with emulation can take a long time to complete
tags: tags:
- docker - saas-linux-2xlarge-amd64 # use largest instance for better performance for arm64 builds
variables: variables:
QEMU_IMAGE: tonistiigi/binfmt:qemu-v7.0.0 QEMU_IMAGE: tonistiigi/binfmt:qemu-v7.0.0
before_script: before_script:

2
.gitlab/ci/e2e.images.yml
View file

@ -24,7 +24,7 @@ e2e-docker:
extends: extends:
- e2e - e2e
variables: variables:
DOCKER: '23.0.1' DOCKER: '24.0.5'
# Image with additional chrome installed # Image with additional chrome installed
e2e-chrome: e2e-chrome: