From dc8cb573119c337d93f810817a5d0c0407548027 Mon Sep 17 00:00:00 2001 From: MrFlutters Date: Tue, 7 May 2019 00:27:11 +0100 Subject: [PATCH] Changed traefik.backend to be unique per build --- .gitlab-ci.yml | 6 +++--- Dockerfile | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b06da15..15c0957 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ before_script: build-master: stage: build script: - - docker build --pull -t "$CI_REGISTRY_IMAGE" . --label traefik.frontend.rule="Host:${DOMAIN}" + - docker build --pull -t "$CI_REGISTRY_IMAGE" . --label traefik.frontend.rule="Host:${DOMAIN}" --label "traefik.backend=${$CI_COMMIT_SHORT_SHA}-${CI_COMMIT_REF_SLUG}-${DOMAIN}" - docker push "$CI_REGISTRY_IMAGE" only: - master @@ -21,7 +21,7 @@ build-master: build-dev: stage: build script: - - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . --label traefik.frontend.rule="Host:www.dev.${DOMAIN}" + - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . --label traefik.frontend.rule="Host:www.dev.${DOMAIN}" --label "traefik.backend=${$CI_COMMIT_SHORT_SHA}-${CI_COMMIT_REF_SLUG}-${DOMAIN}" - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" only: - dev @@ -29,7 +29,7 @@ build-dev: build: stage: build script: - - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . --label traefik.frontend.rule="Host:${CI_COMMIT_REF_SLUG}.dev.${DOMAIN}" + - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . --label traefik.frontend.rule="Host:${CI_COMMIT_REF_SLUG}.dev.${DOMAIN}" --label "traefik.backend=${$CI_COMMIT_SHORT_SHA}-${CI_COMMIT_REF_SLUG}-${DOMAIN}" - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" except: - master diff --git a/Dockerfile b/Dockerfile index 485b26b..67f791a 100755 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,6 @@ LABEL maintainer="MrFlutters (https://github.com/MrFlutters)" COPY docker/nginx.conf /etc/nginx/nginx.conf COPY docker/web.conf /etc/nginx/conf.d/web.conf -LABEL traefik.backend=fluttershub.com LABEL com.centurylinklabs.watchtower.enable="true" LABEL traefik.docker.network=web LABEL traefik.enable=true