Skip to content
Snippets Groups Projects
Commit 98d5f7c5 authored by Ole Langbehn's avatar Ole Langbehn
Browse files

Merge branch 'main' into production

parents 3fdb827a 7b7df2a3
Branches HOTFIX-challenges-carousel
No related tags found
No related merge requests found
......@@ -17,10 +17,10 @@ default:
- 1cpu-4gb # build on smaller machine
build_docker:
image: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:27'
image: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:28'
stage: "build"
services:
- name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:27-dind'
- name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:28-dind'
alias: 'docker'
variables:
# this could be fetched via terraform output ("gcr_location" in infra project), but then we would need an extra job for terraform
......@@ -43,7 +43,7 @@ build_docker:
.deploy:
stage: "deploy"
image:
name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.10.5'
name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.11.0'
# default entrypoint is terraform command, but we want to run shell scripts
entrypoint: ["/bin/sh", "-c"]
variables:
......
1.10.5
1.11.0
......@@ -4,11 +4,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "6.22.0"
version = "6.24.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "6.22.0"
version = "6.24.0"
}
}
backend "gcs" {
......
......@@ -4,11 +4,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "6.22.0"
version = "6.24.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "6.22.0"
version = "6.24.0"
}
}
backend "gcs" {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment