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

Update docker engine and remove manual buildx installation

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

Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Lin Jen-Shin <jen-shin@gitlab.com>
Reviewed-by: Lin Jen-Shin <jen-shin@gitlab.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>
This commit is contained in:
Stan Hu 2023-02-28 07:39:52 +00:00
commit 66ca240929
7 changed files with 18 additions and 60 deletions

View file

@ -3,8 +3,7 @@
extends:
- .build_dynamic_image
variables:
DOCKER: '20.10.21'
BUILDX: '0.9'
DOCKER: '23.0.1'
rules:
- !reference [.build_dynamic_image, rules]
- changes:
@ -14,11 +13,6 @@
docker:
extends:
- .docker
variables:
OS: "debian:bullseye"
docker-slim:
extends:
- .docker
variables:
OS: "debian:bullseye-slim"
parallel:
matrix:
- OS: ['debian:bullseye', 'debian:bullseye-slim']

View file

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