Migrate to Traefik 2.0

This commit is contained in:
2020-09-19 15:09:50 +01:00
parent d586e01051
commit e51a8d048f
3 changed files with 27 additions and 25 deletions

View File

@@ -6,7 +6,6 @@ services:
variables:
DOCKER_DRIVER: overlay2
DOMAIN: "fluttershub.com"
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
@@ -14,24 +13,24 @@ before_script:
build-master:
stage: build
script:
- 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 build --pull -t "$CI_REGISTRY_IMAGE" .
- docker push "$CI_REGISTRY_IMAGE"
only:
- 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}" --label "traefik.backend=${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_REF_SLUG}-${DOMAIN}"
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
only:
- dev
# build-dev:
# stage: build
# script:
# - 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
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}" --label "traefik.backend=${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_REF_SLUG}-${DOMAIN}"
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
except:
- master
- 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}" --label "traefik.backend=${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_REF_SLUG}-${DOMAIN}"
# - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
# except:
# - master
# - dev

View File

@@ -17,10 +17,13 @@ COPY docker/nginx.conf /etc/nginx/nginx.conf
COPY docker/web.conf /etc/nginx/conf.d/web.conf
LABEL com.centurylinklabs.watchtower.enable="true"
LABEL traefik.docker.network=web
LABEL traefik.enable=true
LABEL traefik.http.routers.fluttershub-com.tls=true
LABEL traefik.http.routers.fluttershub-com.rule=Host(`fluttershub.com`)
LABEL traefik.http.routers.fluttershub-com.tls.certresolver=letsencrypt
LABEL traefik.http.services.fluttershub-com.loadbalancer.server.port=80
LABEL traefik.port=80
EXPOSE 80
RUN rm -Rf /usr/share/nginx/html/ && rm /etc/nginx/conf.d/default.conf
COPY --from=builder /usr/src/app/build /usr/share/nginx/html/

View File

@@ -7,12 +7,12 @@ services:
networks:
- external
container_name: fluttershub.com
www.dev.fluttershub.com:
image: registry.gitlab.com/mrflutters/fluttershub:dev
restart: always
networks:
- external
container_name: www.dev.fluttershub.com
# www.dev.fluttershub.com:
# image: registry.gitlab.com/mrflutters/fluttershub:dev
# restart: always
# networks:
# - external
# container_name: www.dev.fluttershub.com
networks:
external:
external: true