Merge branch 'update-cicd-docker-images' into 'master'

Use docker:25 based dind services and runner images

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!133
This commit is contained in:
Jan Tuomi
2024-05-27 12:20:01 +00:00
+6 -6
View File
@@ -79,10 +79,10 @@ test:e2e:
publish:dev:
stage: publish
image: docker:stable
image: docker:25-cli
needs: ["build", "test:e2e", "es:lint", "css:lint"]
services:
- docker:stable-dind
- docker:25-dind
only:
- master
script:
@@ -92,9 +92,9 @@ publish:dev:
publish:prod:
stage: publish
image: docker:stable
image: docker:25-cli
services:
- docker:stable-dind
- docker:25-dind
only:
- production
script:
@@ -104,7 +104,7 @@ publish:prod:
deploy:dev:
stage: deploy
image: docker:stable
image: docker:25-cli
only:
- master
environment:
@@ -124,7 +124,7 @@ deploy:dev:
deploy:prod:
stage: deploy
image: docker:stable
image: docker:25-cli
only:
- production
environment: