From 23df2ef2519fb8b74ee85450793a75c555f3fb94 Mon Sep 17 00:00:00 2001 From: steel <mael.acier@ensiie.fr> Date: Tue, 15 Oct 2024 13:47:56 +0200 Subject: [PATCH] temp fix: https://gitlab.com/gitlab-org/gitlab/-/issues/498511 --- templates/deploy.yml | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/templates/deploy.yml b/templates/deploy.yml index 12b6c7d..04c4c0b 100644 --- a/templates/deploy.yml +++ b/templates/deploy.yml @@ -17,7 +17,22 @@ spec: description: "L'adresse SSH du serveur Dokku" default: "ssh://dokku@deploy.runner.iiens.net" --- -.dokku: +# .dokku: +# stage: $[[ inputs.stage ]] +# when: $[[ inputs.when ]] +# image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/dokku/ci-docker-image +# variables: +# GIT_PUSH_FLAGS: --force +# BRANCH: main +# GIT_REMOTE_URL: $[[ inputs.remote ]]/$[[ inputs.project ]] +# DEPLOY_DOCKER_IMAGE: $[[ inputs.image ]] +# script: +# - echo "Deploying $DEPLOY_DOCKER_IMAGE to $GIT_REMOTE_URL..." +# - dokku-deploy +# after_script: +# - dokku-unlock + +"deploy-$[[ inputs.environment ]]": stage: $[[ inputs.stage ]] when: $[[ inputs.when ]] image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/dokku/ci-docker-image @@ -31,9 +46,7 @@ spec: - dokku-deploy after_script: - dokku-unlock - -"deploy-$[[ inputs.environment ]]": - extends: .dokku + # extends: .dokku environment: name: $[[ inputs.environment ]] url: $[[ inputs.url ]] @@ -41,7 +54,20 @@ spec: on_stop: stop-deploy-$[[ inputs.environment ]] "stop-deploy-$[[ inputs.environment ]]": - extends: .dokku + stage: $[[ inputs.stage ]] + # when: $[[ inputs.when ]] + image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/dokku/ci-docker-image + variables: + GIT_PUSH_FLAGS: --force + BRANCH: main + GIT_REMOTE_URL: $[[ inputs.remote ]]/$[[ inputs.project ]] + DEPLOY_DOCKER_IMAGE: $[[ inputs.image ]] + # script: + # - echo "Deploying $DEPLOY_DOCKER_IMAGE to $GIT_REMOTE_URL..." + # - dokku-deploy + after_script: + - dokku-unlock + # extends: .dokku when: manual needs: - "deploy-$[[ inputs.environment ]]" -- GitLab