Update .gitlab-ci.yml

This commit is contained in:
2019-07-27 00:55:35 +00:00
parent 166fb475a9
commit 9124c598fe

View File

@@ -5,21 +5,27 @@ image: docker:latest
services:
- docker:dind
stages:
- build
variables:
IMAGE_TAG: erichardson/py-eagle-mqtt:$CI_COMMIT_TAG
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
build-master:
stage: build
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE" ./Docker/
- docker push "$CI_REGISTRY_IMAGE"
only:
- master
build:
stage: build
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
except:
- docker build -t $IMAGE_TAG ./Docker/
- docker push $IMAGE_TAG
only:
- master
#build:
# stage: build
# script:
# - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
# - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
# except:
# - master