add explicit version to Dockerfile, circleci

This commit is contained in:
Bradley Cicenas
2017-03-14 21:45:25 +00:00
parent 0ac70c96eb
commit b3cdb33efc
3 changed files with 15 additions and 8 deletions

View File

@@ -1,15 +1,18 @@
machine:
services:
- docker
environment:
VERSION: $(cat VERSION)
IMAGE_NAME: quay.io/vektorlab/ctop
dependencies:
override:
- docker info
- |
if [[ "$CIRCLE_BRANCH" == "master" ]]; then
docker build -t quay.io/vektorlab/ctop:latest .
docker build --build-arg CTOP_VERSION=${VERSION} -t ${IMAGE_NAME}:latest .
else
docker build -t quay.io/vektorlab/ctop:${CIRCLE_BRANCH} .
docker build --build-arg CTOP_VERSION=${VERSION} -t ${IMAGE_NAME}:${CIRCLE_BRANCH} .
fi
test:
@@ -20,5 +23,6 @@ deployment:
hub:
branch: master
commands:
- docker tag ${IMAGE_NAME}:latest ${IMAGE_NAME}:${VERSION}
- docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
- docker push quay.io/vektorlab/ctop:latest
- docker push ${IMAGE_NAME}