From d81e075f586856292726396b3f18aff05099547c Mon Sep 17 00:00:00 2001 From: Florian Hoss Date: Fri, 23 Jun 2023 12:32:38 +0200 Subject: [PATCH] Fix envs --- .gitlab-ci.yml | 4 ++-- dev.sh | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7745ec9..e578070 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: GOLANG_VERSION: '1.20' NODE_VERSION: '18' ALPINE_VERSION: '3' - DEBIAN_IMAGE: '12' + DEBIAN_VERSION: '12' TELEPORT_VERSION: '13.1.1' image: docker:$DOCKER_VERSION-git @@ -70,7 +70,7 @@ container_scanning: deploy_release: rules: !reference [.rules:release, rules] stage: deploy - image: debian:${DEBIAN_IMAGE}-slim + image: debian:${DEBIAN_VERSION}-slim id_tokens: TBOT_GITLAB_JWT: aud: tp.fhoss.de diff --git a/dev.sh b/dev.sh index 89ecf4e..c335c6f 100755 --- a/dev.sh +++ b/dev.sh @@ -17,6 +17,9 @@ parse_yaml() { eval $(parse_yaml .gitlab-ci.yml) -echo "GOLANG_VERSION="$variables_GOLANG_VERSION >.env -echo "ALPINE_VERSION="$variables_ALPINE_VERSION >>.env +echo "DOCKER_VERSION="$variables_DOCKER_VERSION >.env +echo "GOLANG_VERSION="$variables_GOLANG_VERSION >>.env echo "NODE_VERSION="$variables_NODE_VERSION >>.env +echo "ALPINE_VERSION="$variables_ALPINE_VERSION >>.env +echo "DEBIAN_VERSION="$variables_DEBIAN_VERSION >>.env +echo "TELEPORT_VERSION="$variables_TELEPORT_VERSION >>.env