commit: d33d248b69c77a7ab712cfe4b727c0000a77f4ea
parent: 314758c25bbc0044afcec98710c36532a1dc7e0d
Author: rinpatch <rinpatch@sdf.org>
Date: Mon, 3 Jun 2019 10:15:18 +0000
Merge branch 'fix-dokku' into 'develop'
Fix dokku
See merge request pleroma/pleroma!1236
Diffstat:
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -121,8 +121,7 @@ review_app:
- (ssh -t dokku@pleroma.online -- postgres:create $(echo $CI_ENVIRONMENT_SLUG | sed -e 's/-/_/g')_db) || true
- (ssh -t dokku@pleroma.online -- postgres:link $(echo $CI_ENVIRONMENT_SLUG | sed -e 's/-/_/g')_db "$CI_ENVIRONMENT_SLUG") || true
- (ssh -t dokku@pleroma.online -- certs:add "$CI_ENVIRONMENT_SLUG" /home/dokku/server.crt /home/dokku/server.key) || true
- - (git remote add dokku dokku@pleroma.online:$CI_ENVIRONMENT_SLUG) || true
- - git push -f dokku $CI_COMMIT_SHA:refs/heads/master
+ - git push -f dokku@pleroma.online:$CI_ENVIRONMENT_SLUG $CI_COMMIT_SHA:refs/heads/master
stop_review_app:
image: alpine:3.9