logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 55ac38c1d26eb2e59b66eea224f621283d187212
parent: 51f40fab0055a75b4a0f4514f78f7004d755c1e5
Author: lain <lain@soykaf.club>
Date:   Mon, 11 Nov 2019 15:01:31 +0000

Merge branch 'fix-dokku-2' into 'develop'

Dokku deploys: Keep the git dir so version number generation works.

See merge request pleroma/pleroma!1967

Diffstat:

M.gitlab-ci.yml1+
1 file changed, 1 insertion(+), 0 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml @@ -113,6 +113,7 @@ review_app: - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - - ssh-keyscan -H "pleroma.online" >> ~/.ssh/known_hosts - (ssh -t dokku@pleroma.online -- apps:create "$CI_ENVIRONMENT_SLUG") || true + - (ssh -t dokku@pleroma.online -- git:set "$CI_ENVIRONMENT_SLUG" keep-git-dir true) || true - ssh -t dokku@pleroma.online -- config:set "$CI_ENVIRONMENT_SLUG" APP_NAME="$CI_ENVIRONMENT_SLUG" APP_HOST="$CI_ENVIRONMENT_SLUG.pleroma.online" MIX_ENV=dokku - (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