From 12f84245f8b5d677783131896dbf0a1edfcac401 Mon Sep 17 00:00:00 2001
From: MrFlutters <DeriousHD@Gmail.com>
Date: Fri, 3 May 2019 17:04:28 +0100
Subject: [PATCH] Updated Configuration

---
 .gitlab-ci.yml     | 7 +++++--
 Dockerfile         | 2 +-
 docker-compose.yml | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4daf995..9bdeb70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,16 @@ image: docker:latest
 services:
   - docker:dind
 
+variables:
+  DOMAIN: "Fluttershub.com"
+
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
 
 build-master:
   stage: build
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE" .
+    - docker build --pull --label traefik.frontend.rule="Host:${DOMAIN}" -t "$CI_REGISTRY_IMAGE" .
     - docker push "$CI_REGISTRY_IMAGE"
   only:
     - master
@@ -18,7 +21,7 @@ build-master:
 build:
   stage: build
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+    - docker build --pull --label traefik.frontend.rule="Host:${CI_COMMIT_REF_SLUG}.fluttershub.com" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
   except:
     - master
diff --git a/Dockerfile b/Dockerfile
index 40d7948..4cbd0fe 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ COPY docker/nginx.conf /etc/nginx/nginx.conf
 COPY docker/web.conf /etc/nginx/conf.d/web.conf
 
 LABEL traefik.backend=fluttershub_home
-LABEL traefik.frontend.rule="Host:fluttershub.com"
+LABEL traefik.frontend.rule="Host:${CI_COMMIT_REF_SLUG}fluttershub.com"
 LABEL traefik.docker.network=web
 LABEL traefik.frontend.redirect.entryPoint=https
 LABEL traefik.enable=true
diff --git a/docker-compose.yml b/docker-compose.yml
index bdf88f8..3c27209 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,11 +2,11 @@ version: "3"
 
 services:
   home:
-    image: mrflutters/home:1.0.0
+    image: registry.gitlab.com/mrflutters/flutters-website-dockertesting:dev
     restart: always
     networks:
-      - web
+      - external
     container_name: Fluttershub_home
 networks:
-  web:
+  external:
     external: true