diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1391a325e460f710b728ccb434a8b7a2d12a173..78ecfbae15303a6de9fa5622eb36475ba7a9d5e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,9 @@ default: before_script: - set -ex - - 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 tags: - 1cpu-4gb @@ -11,7 +13,7 @@ variables: .deploy: 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' entrypoint: ["/bin/sh", "-c"] variables: ENVIRONMENT_ID: $CI_ENVIRONMENT_SLUG @@ -23,14 +25,13 @@ variables: name: "${CI_JOB_NAME}_${CI_JOB_ID}" expire_in: 1 month script: - - export GOOGLE_APPLICATION_CREDENTIALS=${GOOGLE_CLOUD_SERVICE_ACCOUNT} - terraform/environments/scripts/create-or-update-env.sh $ENVIRONMENT_ID $CI_COMMIT_SHA - echo "$(terraform/environments/scripts/get-api-domain.sh)" > $API_DOMAIN_PATH resource_group: $ENVIRONMENT_ID interruptible: false cache_lint: - image: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/denoland/deno:alpine-1.40.1' + image: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/denoland/deno:alpine-1.45.2' stage: "test" script: - deno cache --lock=deno.lock app/deps.ts app/dev_deps.ts @@ -44,9 +45,9 @@ include: build_docker: needs: ["cache_lint"] - 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' services: - - docker:20.10-dind + - 'docker:27-dind' variables: GCR_IMAGE: europe-north1-docker.pkg.dev/holi-shared/docker/holi-translation-api script: diff --git a/Dockerfile b/Dockerfile index a71be66cb48e9d515db5ace32114c5fdd7c2844f..79dc6a8835e1c535bd8edd3eb32819d7b94a5f45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/denoland/deno:alpine-1.40.1 +FROM europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/denoland/deno:alpine-1.45.2 # The port that your application listens to. EXPOSE 8089