diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-03 10:15:18 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-03 10:15:18 +0000 |
| commit | d33d248b69c77a7ab712cfe4b727c0000a77f4ea (patch) | |
| tree | e8fce15cf3a9b93d2613064652b7c56c49767402 | |
| parent | 314758c25bbc0044afcec98710c36532a1dc7e0d (diff) | |
| parent | 9ded9443a3551360991dfa28ced07502037c4559 (diff) | |
| download | pleroma-d33d248b69c77a7ab712cfe4b727c0000a77f4ea.tar.gz | |
Merge branch 'fix-dokku' into 'develop'
Fix dokku
See merge request pleroma/pleroma!1236
| -rw-r--r-- | .gitlab-ci.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 939175218..58c9de167 100644 --- 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 |