HotaruBlaze/Homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed traefik.backend to be unique per build

Browse Source
This commit is contained in:
MrFlutters
2019-05-07 00:27:11 +01:00
parent d716a493a0
commit dc8cb57311
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@@ -13,7 +13,7 @@ before_script:
build-master: build-master:
stage: build stage: build
script: 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" - docker push "$CI_REGISTRY_IMAGE"
only: only:
- master - master
@@ -21,7 +21,7 @@ build-master:
build-dev: build-dev:
stage: build stage: build
script: 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" - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
only: only:
- dev - dev
@@ -29,7 +29,7 @@ build-dev:
build: build:
stage: build stage: build
script: 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" - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
except: except:
- master - master

1
Dockerfile
View File

@@ -17,7 +17,6 @@ LABEL maintainer="MrFlutters (https://github.com/MrFlutters)"
COPY docker/nginx.conf /etc/nginx/nginx.conf COPY docker/nginx.conf /etc/nginx/nginx.conf
COPY docker/web.conf /etc/nginx/conf.d/web.conf COPY docker/web.conf /etc/nginx/conf.d/web.conf
LABEL traefik.backend=fluttershub.com
LABEL com.centurylinklabs.watchtower.enable="true" LABEL com.centurylinklabs.watchtower.enable="true"
LABEL traefik.docker.network=web LABEL traefik.docker.network=web
LABEL traefik.enable=true LABEL traefik.enable=true