Skip to content
Snippets Groups Projects
Commit a35fb591 authored by Dima Rosmait's avatar Dima Rosmait
Browse files

Merge branch 'main' into production

parents 2a60bdcb 64ca60de
No related branches found
No related tags found
No related merge requests found
...@@ -9,16 +9,18 @@ stages: ...@@ -9,16 +9,18 @@ stages:
default: default:
before_script: before_script:
- set -eux - set -eux
- env # env -0 | sort -z | tr '\0' '\n': Sort env output alphabetically, keeping multiline variables intact
# egrep: Remove sensitive information from the output of env
- env -0 | sort -z | tr '\0' '\n' | egrep -ve '^(DOCKER_AUTH_CONFIG|GOOGLE_APPLICATION_CREDENTIALS)=.*'
interruptible: true interruptible: true
tags: tags:
- 1cpu-4gb # build on smaller machine - 1cpu-4gb # build on smaller machine
build_docker: build_docker:
image: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:20.10' image: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:27'
stage: "build" stage: "build"
services: services:
- docker:20.10-dind - 'docker:27-dind'
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
ARTIFACT_IMAGE: 'europe-north1-docker.pkg.dev/holi-shared/docker/holi-chat-server' ARTIFACT_IMAGE: 'europe-north1-docker.pkg.dev/holi-shared/docker/holi-chat-server'
...@@ -38,7 +40,7 @@ build_docker: ...@@ -38,7 +40,7 @@ build_docker:
.deploy: .deploy:
stage: "deploy" stage: "deploy"
image: image:
name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.6.1' name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.6.6'
# 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:
......
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