From 23bcf8c9c4b22a39a8ae14d33fe8ff83f0896c79 Mon Sep 17 00:00:00 2001
From: Daya Adianto <dayaadianto@cs.ui.ac.id>
Date: Mon, 13 Nov 2023 18:19:36 +0700
Subject: [PATCH] Remove DOKKU_* variables
---
.gitlab-ci.yml | 6 +++---
.gitlab/ci/deploy-template.gitlab-ci.yml | 10 +++-------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77d7235a..e478952f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,9 +82,9 @@ deploy:
extends: .base-dokku-deploy
rules: !reference [.upstream-deploy-production-rules, rules]
variables:
- DOKKU_APP_NAME: spring-petclinic-rest
- DOKKU_SSH_REMOTE: "ssh://dokku@dokku-ppl.cs.ui.ac.id:22"
- DOKKU_SSH_PRIVATE_KEY: $PRODUCTION_SSH_PRIVATE_KEY
+ APP_NAME: spring-petclinic-rest
+ SSH_REMOTE: "ssh://dokku@dokku-ppl.cs.ui.ac.id:22"
+ SSH_PRIVATE_KEY: $PRODUCTION_SSH_PRIVATE_KEY
script:
- dokku network:exists "${APP_NAME}-network" || dokku network:create "${APP_NAME}-network"
- dokku postgres:exists "${APP_NAME}-database" || dokku postgres:create "${APP_NAME}-database" \
diff --git a/.gitlab/ci/deploy-template.gitlab-ci.yml b/.gitlab/ci/deploy-template.gitlab-ci.yml
index 94a55c0b..52ff6670 100644
--- a/.gitlab/ci/deploy-template.gitlab-ci.yml
+++ b/.gitlab/ci/deploy-template.gitlab-ci.yml
@@ -3,16 +3,12 @@
stage: deploy
image: docker.io/dokku/ci-docker-image:0.9.3
variables:
- APP_NAME: "${DOKKU_APP_NAME:-$CI_PROJECT_PATH_SLUG}"
- SSH_REMOTE: "${DOKKU_SSH_REMOTE:-ssh://dokku@dokku-ppl.cs.ui.ac.id:22}"
- SSH_PRIVATE_KEY: "${DOKKU_SSH_PRIVATE_KEY:-}"
+ APP_NAME: $CI_PROJECT_PATH_SLUG
+ SSH_REMOTE: "ssh://dokku@dokku-ppl.cs.ui.ac.id:22"
+ SSH_PRIVATE_KEY: ""
BRANCH: $CI_DEFAULT_BRANCH
GIT_DEPTH: 0
before_script:
- chmod +x .gitlab/bin/dokku.sh
- cp .gitlab/bin/dokku.sh /bin/dokku
- - echo "[DEBUG] APP_NAME is $APP_NAME"
- - echo "[DEBUG] DOKKU_APP_NAME is $DOKKU_APP_NAME"
- - echo "[DEBUG] SSH_REMOTE is $SSH_REMOTE"
- - echo "[DEBUG] DOKKU_SSH_REMOTE is $DOKKU_SSH_REMOTE"
dependencies: []
--
GitLab