Commit 08d24ac7 authored by echel0n's avatar echel0n

Merge branch 'hotfix-20190112-02' into develop

parents 7f8c2d79 831f077c
......@@ -2,8 +2,7 @@ before_script:
- apk add --no-cache py-pip
variables:
CONTAINER_IMAGE: sickrage/sickrage:`cat sickrage/version.txt`
CONTAINER_IMAGE_LATEST: sickrage/sickrage:latest
CONTAINER_IMAGE: sickrage/sickrage
DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://localhost:2375
......@@ -15,11 +14,12 @@ build:
stage: build
image: docker:latest
script:
- echo $CONTAINER_IMAGE
- echo -n $CI_REGISTRY_PASSWORD | docker login -u "$CI_REGISTRY_USER" --password-stdin
- docker build --network host -t $CONTAINER_IMAGE_LATEST .
- docker tag ${CONTAINER_IMAGE} ${CONTAINER_IMAGE_LATEST}
- docker push ${CONTAINER_IMAGE}
- docker push ${CONTAINER_IMAGE_LATEST}
- docker build --network host -t $CONTAINER_IMAGE:$(cat sickrage/version.txt) .
- docker tag $CONTAINER_IMAGE:$(cat sickrage/version.txt) $CONTAINER_IMAGE:latest
- docker push $CONTAINER_IMAGE:$(cat sickrage/version.txt)
- docker push $CONTAINER_IMAGE:latest
only:
- master
except:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment