mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-12-28 13:53:07 +02:00
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
This commit is contained in:
commit
b7805e48a6
2 changed files with 11 additions and 2 deletions
|
@ -9,6 +9,7 @@ mongodb:
|
|||
db: test-misskey
|
||||
user: admin
|
||||
pass: ''
|
||||
# __REDIS__
|
||||
redis:
|
||||
host: localhost
|
||||
port: 6379
|
||||
|
|
|
@ -97,14 +97,22 @@ jobs:
|
|||
- run:
|
||||
name: Build
|
||||
command: |
|
||||
docker build .
|
||||
docker build . | tee docker.log
|
||||
tail -n 1 docker.log | read __Successfully __built tag
|
||||
- when:
|
||||
condition: <<parameters.with_deploy>>
|
||||
steps:
|
||||
- run:
|
||||
name: Deploy
|
||||
command: |
|
||||
docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD && docker push misskey/misskey
|
||||
if [ "$DOCKERHUB_USERNAME$DOCKERHUB_PASSWORD" ]
|
||||
then
|
||||
docker tag $tag misskey/misskey
|
||||
docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
|
||||
docker push misskey/misskey
|
||||
else
|
||||
echo -e '\033[0;33mAborted deploying to Docker Hub\033[0;39m'
|
||||
fi
|
||||
|
||||
workflows:
|
||||
version: 2
|
||||
|
|
Loading…
Reference in a new issue