From 166172cc0095a439bd469225e6d9c0a23d9f5c90 Mon Sep 17 00:00:00 2001
From: Luke Else <mail@luke-else.co.uk>
Date: Sat, 5 Oct 2024 12:06:27 +0100
Subject: [PATCH] Updated CICD config

---
 TraefikRunner/docker-compose.yml | 41 ++++++++++++++++++++++++++++++++
 cicd-spindown.sh                 |  2 +-
 cicd-spinup.sh                   | 22 +++--------------
 3 files changed, 45 insertions(+), 20 deletions(-)
 create mode 100644 TraefikRunner/docker-compose.yml

diff --git a/TraefikRunner/docker-compose.yml b/TraefikRunner/docker-compose.yml
new file mode 100644
index 0000000..1575aff
--- /dev/null
+++ b/TraefikRunner/docker-compose.yml
@@ -0,0 +1,41 @@
+version: "3.8"
+services:
+  traefik:
+    image: "traefik:latest"
+    container_name: "traefik"
+    command:
+      - "--api.dashboard=true"
+      - "--providers.docker=true"
+      - "--providers.docker.exposedbydefault=false"
+      - "--entrypoints.web.address=:80"
+      - "--entrypoints.websecure.address=:443"
+      - "--certificatesresolvers.myresolver.acme.tlschallenge=true"
+      - "--certificatesresolvers.myresolver.acme.email=contact@luke-else.co.uk"
+      - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json"
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - "./letsencrypt:/letsencrypt"
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+
+      - "traefik.http.middlewares.redirect-web-secure.redirectscheme.scheme=https"
+      - "traefik.http.routers.traefik-insecure.middlewares=redirect-web-secure"
+      - "traefik.http.routers.traefik-insecure.rule=Host(`traefik.cicd.luke-else.co.uk`)"
+      - "traefik.http.routers.traefik-insecure.entrypoints=web"
+
+      - "traefik.http.routers.traefik.rule=Host(`traefik.cicd.luke-else.co.uk`)"
+      - "traefik.http.routers.traefik.entrypoints=websecure"
+      - "traefik.http.routers.traefik.service=api@internal"
+      - "traefik.http.routers.traefik.tls.certresolver=myresolver" 
+      - "traefik.http.routers.traefik.middlewares=traefik-auth"
+      - "traefik.http.middlewares.traefik-auth.basicauth.users=user:$$2y$$05$$s/vPphFtSO2fWJR7SYkEb.90UwPDRM3aOKqgOF/rme/3fUQ5tvpTS"
+    restart: unless-stopped
+
+networks:
+  proxy:
+    name: proxy
\ No newline at end of file
diff --git a/cicd-spindown.sh b/cicd-spindown.sh
index 72b9a7f..1315fcf 100644
--- a/cicd-spindown.sh
+++ b/cicd-spindown.sh
@@ -3,7 +3,7 @@
     docker-compose down
     cd ../..
 
-cd ./Traefik/
+cd ./TraefikRunner/
 docker-compose down
 cd ..
 
diff --git a/cicd-spinup.sh b/cicd-spinup.sh
index a248849..f5e3769 100644
--- a/cicd-spinup.sh
+++ b/cicd-spinup.sh
@@ -1,25 +1,9 @@
 #Script file for spinning up all docker-containers
 
-cd ./Traefik/
+cd ./TraefikRunner/
 docker-compose pull && docker-compose up -d
 cd ..
 
-cd ./Websites/
-docker-compose pull && docker-compose up -d
-cd ..
-
-    cd ./Development/Gitea/
+    cd ./Development/Runners/
     docker-compose pull && docker-compose up -d
-    cd ../..
-
-cd ./Database/
-docker-compose pull && docker-compose up -d
-cd ..
-
-cd ./Bitwarden/
-docker-compose pull && docker-compose up -d
-cd ..
-
-cd ./Misc/
-docker-compose pull && docker-compose up -d
-cd ..
\ No newline at end of file
+    cd ../..
\ No newline at end of file