Combine PROD and DEV images

This commit is contained in:
Aarni Halinen
2019-11-03 17:01:38 +02:00
parent b23e439eb5
commit dab6f98ec2
4 changed files with 4 additions and 36 deletions
+1 -15
View File
@@ -45,20 +45,6 @@ remark:
script:
- npm run remark
# 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
@@ -69,7 +55,7 @@ publish:
script:
- docker info
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker build . -f Dockerfile.prod -t "$IMAGE_NAME"
- docker build . -t "$IMAGE_NAME"
- docker push "$IMAGE_NAME"
deploy_dev: