Add placeholder publish to fix dev server

This commit is contained in:
Aarni Halinen
2019-10-08 00:42:44 +03:00
parent d17d1fb1b7
commit 95e72b7ab2
2 changed files with 17 additions and 3 deletions
+16 -2
View File
@@ -46,13 +46,27 @@ remark:
script:
- npm run remark
publish:
# TODO: remove
publish_dev:
stage: publish
image: docker:stable
services:
- docker:stable-dind
only:
- develop
script:
- docker info
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker build . -t "$IMAGE_NAME_DEV"
- docker push "$IMAGE_NAME_DEV"
publish:
stage: publish
image: docker:stable
services:
- docker:stable-dind
only:
- master
script:
- docker info
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
@@ -79,7 +93,7 @@ deploy_dev:
- scp docker-compose.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/docker-compose.yml
- scp .deploy_dev.sh $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/deploy_dev.sh
- ssh $DEV_SSH_USER@$DEV_SSH_HOST "docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY"
- ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment/deploy_dev.sh \"$IMAGE_NAME\""
- ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment/deploy_dev.sh \"$IMAGE_NAME_DEV\""
# deploy_production:
# stage: deploy
+1 -1
View File
@@ -5,7 +5,7 @@ services:
image: postgres
web:
build: .
image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend
image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend:dev
command: ["bash", "-c", "cd /code && ./wait-for-it.sh db:5432 -- bash setup.sh --no-input --no-npm && python manage.py runserver 0.0.0.0:8000"]
ports:
- "8000:8000"