Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2018-10-31 22:08:27 +09:00
commit b7805e48a6
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
2 changed files with 11 additions and 2 deletions

View File

@ -9,6 +9,7 @@ mongodb:
db: test-misskey db: test-misskey
user: admin user: admin
pass: '' pass: ''
# __REDIS__
redis: redis:
host: localhost host: localhost
port: 6379 port: 6379

View File

@ -97,14 +97,22 @@ jobs:
- run: - run:
name: Build name: Build
command: | command: |
docker build . docker build . | tee docker.log
tail -n 1 docker.log | read __Successfully __built tag
- when: - when:
condition: <<parameters.with_deploy>> condition: <<parameters.with_deploy>>
steps: steps:
- run: - run:
name: Deploy name: Deploy
command: | 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: workflows:
version: 2 version: 2