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

Migrate to Traefik 2.0

Browse Source
This commit is contained in:
Phoenix
2020-09-19 15:09:50 +01:00
parent d586e01051
commit e51a8d048f
3 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
.gitlab-ci.yml
View File

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

7
Dockerfile
View File

@@ -17,10 +17,13 @@ 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 com.centurylinklabs.watchtower.enable="true" LABEL com.centurylinklabs.watchtower.enable="true"
LABEL traefik.docker.network=web LABEL traefik.http.routers.fluttershub-com.tls=true
LABEL traefik.enable=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 LABEL traefik.port=80
EXPOSE 80 EXPOSE 80
RUN rm -Rf /usr/share/nginx/html/ && rm /etc/nginx/conf.d/default.conf 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/ COPY --from=builder /usr/src/app/build /usr/share/nginx/html/

12
docker-compose.yml
View File

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