From 1ee167aad353190931caadc78e74a27acfa3f9ca Mon Sep 17 00:00:00 2001
From: Luke Else <mail@luke-else.co.uk>
Date: Mon, 7 Aug 2023 22:33:38 +0100
Subject: [PATCH] Moved to a new container... hopefully we have the same
 results

---
 Development/Gitea/docker-compose.yml | 12 ++++++---
 Traefik/docker-compose.yml           | 39 +++-------------------------
 2 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/Development/Gitea/docker-compose.yml b/Development/Gitea/docker-compose.yml
index 4113753..5c9e319 100644
--- a/Development/Gitea/docker-compose.yml
+++ b/Development/Gitea/docker-compose.yml
@@ -1,8 +1,7 @@
 version: '3.8'
 
 services:
-
-#gitea (222)
+  #gitea (222)
   gitea:
     image: gitea/gitea:latest
     container_name: gitea
@@ -10,6 +9,8 @@ services:
       - ./gitea:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+    networks:
+      - proxy
     ports:
       - "222:22"
     environment:
@@ -28,7 +29,12 @@ services:
     labels:
       ## Expose Gitea Through Trefik ##
       - "traefik.enable=true" # <== Enable traefik to proxy this container
+      - "traefik.http.services.gitea.loadbalancer.server.port=3000"
       - "traefik.http.routers.gitea.rule=Host(`test.luke-else.co.uk`)"
       - "traefik.http.routers.gitea.entrypoints=websecure"
       - "traefik.http.routers.gitea.tls.certresolver=myresolver"
-    restart: unless-stopped
\ No newline at end of file
+    restart: unless-stopped
+
+networks:
+  proxy:
+    external: true
\ No newline at end of file
diff --git a/Traefik/docker-compose.yml b/Traefik/docker-compose.yml
index bc00c07..9282fea 100644
--- a/Traefik/docker-compose.yml
+++ b/Traefik/docker-compose.yml
@@ -30,39 +30,6 @@ services:
       - "traefik.http.middlewares.traefik-auth.basicauth.users=user:$$2y$$05$$s/vPphFtSO2fWJR7SYkEb.90UwPDRM3aOKqgOF/rme/3fUQ5tvpTS"
     restart: unless-stopped
 
-
-
-
-
-
-    #gitea (222)
-  gitea:
-    image: gitea/gitea:latest
-    container_name: gitea
-    volumes:
-      - ./gitea:/data
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-    ports:
-      - "222:22"
-    environment:
-      - APP_NAME="gitea"
-      - USER_UID=1000
-      - USER_GID=1000
-      - USER=git
-      - RUN_MODE=prod
-      - DOMAIN=test.luke-else.co.uk
-      - SSH_DOMAIN=test.luke-else.co.uk
-      - HTTP_PORT=3000
-      - ROOT_URL=https://test.luke-else.co.uk
-      - SSH_PORT=222
-      - SSH_LISTEN_PORT=22
-      - DB_TYPE=sqlite3
-    labels:
-      ## Expose Gitea Through Trefik ##
-      - "traefik.enable=true" # <== Enable traefik to proxy this container
-      - "traefik.http.services.gitea.loadbalancer.server.port=3000"
-      - "traefik.http.routers.gitea.rule=Host(`test.luke-else.co.uk`)"
-      - "traefik.http.routers.gitea.entrypoints=websecure"
-      - "traefik.http.routers.gitea.tls.certresolver=myresolver"
-    restart: unless-stopped
\ No newline at end of file
+networks:
+  proxy:
+    name: proxy
\ No newline at end of file