From 63b5602e80fb2c7f24bc842ff97dd092273157f7 Mon Sep 17 00:00:00 2001
From: Elian Loraux <elian.loraux@tetras-libre.fr>
Date: Thu, 8 Feb 2024 13:50:56 +0100
Subject: [PATCH] =?UTF-8?q?S=C3=A9paration=20du=20traefik=20et=20du=20dock?=
 =?UTF-8?q?er-compose?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.sample        |  2 ++
 docker-compose.yml | 50 +++++++++++++++++-----------------------------
 traefik.yml        | 18 +++++++++++++++++
 3 files changed, 38 insertions(+), 32 deletions(-)
 create mode 100644 traefik.yml

diff --git a/.env.sample b/.env.sample
index 5e9e9f9..b506632 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,3 +1,5 @@
+COMPOSE_FILE=docker-compose.yml:traefik.yml
+
 NAME=servermon
 HOST=some-host.fqdn
 PASS=change-me
diff --git a/docker-compose.yml b/docker-compose.yml
index a766574..b665a83 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,35 +1,21 @@
-version: '2'
+version: '3'
 services:
 
- phpservermonitor:
-    build: ./src
-    restart: always
-    depends_on:
-     - mysql
-    volumes:
-     - ${PWD}/config.php:/var/www/html/config.php:rw
-    networks:
-      - default
-      - traefik
-    labels:
-      - "traefik.enable=true"
-      - "traefik.docker.network=traefik"
-      - "traefik.http.routers.${NAME}.rule=Host(`${HOST}`)"
-      - "traefik.http.routers.${NAME}.tls.certresolver=myresolver"
-      - "traefik.http.routers.${NAME}.entrypoints=web,websecure"
-      - "traefik.http.routers.${NAME}.middlewares=hardening@docker"
+    phpservermonitor:
+        build: ./src
+        restart: always
+        depends_on:
+            - mysql
+        volumes:
+            - ${PWD}/config.php:/var/www/html/config.php:rw
 
- mysql:
-    image: mysql:5.7
-    environment:
-     - MYSQL_ROOT_PASSWORD=${PASS}
-     - MYSQL_USER=${MYSQL_USER}
-     - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-     - MYSQL_DATABASE=${MYSQL_DATABASE}
-    volumes:
-     - ./mysql/db-data:/var/lib/mysql
-    restart: always
-
-networks:
-  traefik:
-    external: true
+    mysql:
+        image: mysql:latest
+        environment:
+            - MYSQL_ROOT_PASSWORD=${PASS}
+            - MYSQL_USER=${MYSQL_USER}
+            - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+            - MYSQL_DATABASE=${MYSQL_DATABASE}
+        volumes:
+            - ./mysql/db-data:/var/lib/mysql
+        restart: always
diff --git a/traefik.yml b/traefik.yml
new file mode 100644
index 0000000..48eeb95
--- /dev/null
+++ b/traefik.yml
@@ -0,0 +1,18 @@
+version: "3"
+services:
+  kasm:
+    networks:
+      - default
+      - traefik
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=traefik"
+      - "traefik.http.routers.${NAME}.rule=Host(`${HOST}`)"
+      - "traefik.http.routers.${NAME}.tls.certresolver=myresolver"
+      - "traefik.http.routers.${NAME}.entrypoints=web,websecure"
+      - "traefik.http.services.${NAME}.loadbalancer.server.port=6901"
+      - "traefik.http.services.${NAME}.loadbalancer.server.scheme=https"
+
+networks:
+  traefik:
+    external: true
-- 
GitLab