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

Merge branch 'main' into production

parents 0c202e22 a06e1b30
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,7 @@ variables: ...@@ -15,7 +15,7 @@ variables:
.deploy: .deploy:
image: 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 # default entrypoint is terraform command, but we want to run shell scripts
entrypoint: ['/bin/sh', '-c'] entrypoint: ['/bin/sh', '-c']
variables: variables:
...@@ -72,9 +72,9 @@ include: ...@@ -72,9 +72,9 @@ include:
build_docker: build_docker:
needs: ['cache_lint_test'] needs: ['cache_lint_test']
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'
services: 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' alias: 'docker'
variables: variables:
# this could be fetched via terraform output ("gcr_location" in infra project), but then we would need an extra job for terraform # this could be fetched via terraform output ("gcr_location" in infra project), but then we would need an extra job for terraform
...@@ -112,7 +112,7 @@ review_smoketest: ...@@ -112,7 +112,7 @@ review_smoketest:
review_destroy: review_destroy:
needs: ['review_deploy'] needs: ['review_deploy']
image: 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 # default entrypoint is terraform command, but we want to run shell scripts
entrypoint: ['/bin/sh', '-c'] entrypoint: ['/bin/sh', '-c']
variables: variables:
......
1.10.5 1.11.0
...@@ -4,11 +4,11 @@ terraform { ...@@ -4,11 +4,11 @@ terraform {
required_providers { required_providers {
google = { google = {
source = "hashicorp/google" source = "hashicorp/google"
version = "6.22.0" version = "6.24.0"
} }
google-beta = { google-beta = {
source = "hashicorp/google-beta" source = "hashicorp/google-beta"
version = "6.22.0" version = "6.24.0"
} }
} }
backend "gcs" { backend "gcs" {
......
...@@ -4,11 +4,11 @@ terraform { ...@@ -4,11 +4,11 @@ terraform {
required_providers { required_providers {
google = { google = {
source = "hashicorp/google" source = "hashicorp/google"
version = "6.22.0" version = "6.24.0"
} }
google-beta = { google-beta = {
source = "hashicorp/google-beta" source = "hashicorp/google-beta"
version = "6.22.0" version = "6.24.0"
} }
} }
backend "gcs" { 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