Merge branch 'master' into develop
This commit is contained in:
commit
158bddf60f
2 changed files with 3 additions and 3 deletions
|
@ -6,8 +6,6 @@ name: default
|
||||||
steps:
|
steps:
|
||||||
- name: debug
|
- name: debug
|
||||||
image: alpine
|
image: alpine
|
||||||
environment:
|
|
||||||
|
|
||||||
commands:
|
commands:
|
||||||
- 'echo "Repository: glenux/service-drone-server"'
|
- 'echo "Repository: glenux/service-drone-server"'
|
||||||
- 'echo "Git commit: ${DRONE_COMMIT_SHA:0:8}"'
|
- 'echo "Git commit: ${DRONE_COMMIT_SHA:0:8}"'
|
||||||
|
@ -88,7 +86,7 @@ steps:
|
||||||
# - ssh -o StrictHostKeyChecking=no
|
# - ssh -o StrictHostKeyChecking=no
|
||||||
# -i ~/.ssh/deploy_key
|
# -i ~/.ssh/deploy_key
|
||||||
# "$SSH_USER@$SSH_HOST"
|
# "$SSH_USER@$SSH_HOST"
|
||||||
# git:from-image automation
|
# git:from-image cicd
|
||||||
# "glenux/service-drone-server:${DRONE_COMMIT_SHA:0:8}"
|
# "glenux/service-drone-server:${DRONE_COMMIT_SHA:0:8}"
|
||||||
# #
|
# #
|
||||||
|
|
||||||
|
|
|
@ -43,3 +43,5 @@ Deploy
|
||||||
git remote add dokku dokku@dokku.example.com:cicd
|
git remote add dokku dokku@dokku.example.com:cicd
|
||||||
git push dokku master
|
git push dokku master
|
||||||
|
|
||||||
|
dokku git:from-image cicd "glenux/service-drone-server:$IMAGE_TAG"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue