From 1a222d2534851435c9acd3351e50db57099cf69a Mon Sep 17 00:00:00 2001
From: MHUSXB66 <mhurstel@gmail.com>
Date: Wed, 17 Jan 2024 14:23:16 +0100
Subject: [PATCH 1/2] update

---
 .env.example       |   4 +-
 .env.production    |   3 ++
 docker-compose.yml | 112 ++++++++++++---------------------------------
 3 files changed, 34 insertions(+), 85 deletions(-)

diff --git a/.env.example b/.env.example
index 9504186ea..2edb98e90 100644
--- a/.env.example
+++ b/.env.example
@@ -20,8 +20,8 @@ DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=speedtest_tracker
-DB_USERNAME=
-DB_PASSWORD=
+DB_USERNAME=speedtest
+DB_PASSWORD=speedtest
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=database
diff --git a/.env.production b/.env.production
index 646417915..57683c3fd 100644
--- a/.env.production
+++ b/.env.production
@@ -21,3 +21,6 @@ MAIL_FROM_NAME="Speedtest Tracker"
 
 # Telegram bot config
 TELEGRAM_BOT_TOKEN=null
+DB_PASSWORD=speedtest
+DB_USERNAME=speedtest
+DB_DATABASE=speedtest
diff --git a/docker-compose.yml b/docker-compose.yml
index 2ed018c1d..1358d6592 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,91 +1,37 @@
-version: '3'
+version: '3.3'
 services:
-    laravel.test:
-        build:
-            context: ./docker/8.2
-            dockerfile: Dockerfile
-            args:
-                WWWGROUP: '${WWWGROUP}'
-        image: speedtest-tracker-8.2/app
-        extra_hosts:
-            - 'host.docker.internal:host-gateway'
+    speedtest-tracker:
+        container_name: speedtest-tracker
         ports:
-            - '${APP_PORT:-80}:80'
-            - '${VITE_PORT:-5173}:${VITE_PORT:-5173}'
+            - '8586:80'
+            - '8486:443'
         environment:
-            WWWUSER: '${WWWUSER}'
-            LARAVEL_SAIL: 1
-            XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}'
-            XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}'
+            - PUID=1000
+            - PGID=1000
+            - DB_CONNECTION=mysql
+            - DB_HOST=db
+            - DB_PORT=3306
+            - DB_DATABASE=speedtest_tracker
+            - DB_USERNAME=speedy
+            - DB_PASSWORD=password
         volumes:
-            - '.:/var/www/html'
-        networks:
-            - sail
+            - /srv/dev-disk-by-uuid-485c8266-0849-4fb7-992f-3c143e4bfb73/containers/speedtest/speedtest-app:/config
+            - /srv/dev-disk-by-uuid-485c8266-0849-4fb7-992f-3c143e4bfb73/containers/speedtest/web:/etc/ssl/web
+        image: 'ghcr.io/alexjustesen/speedtest-tracker:latest'
+        restart: unless-stopped
         depends_on:
-            - mysql
-            - mailpit
-            # - pgsql
-    mysql:
-        image: 'mysql/mysql-server:8.0'
-        ports:
-            - '${FORWARD_DB_PORT:-3306}:3306'
+            - db
+    db:
+        image: mariadb:10
+        restart: always
         environment:
-            MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
-            MYSQL_ROOT_HOST: '%'
-            MYSQL_DATABASE: '${DB_DATABASE}'
-            MYSQL_USER: '${DB_USERNAME}'
-            MYSQL_PASSWORD: '${DB_PASSWORD}'
-            MYSQL_ALLOW_EMPTY_PASSWORD: 1
+            - MARIADB_DATABASE=speedtest_tracker
+            - MARIADB_USER=speedy
+            - MARIADB_PASSWORD=password
+            - MARIADB_RANDOM_ROOT_PASSWORD=true
         volumes:
-            - 'sail-mysql:/var/lib/mysql'
-            - './docker/mysql/create-testing-database.sh:/docker-entrypoint-initdb.d/10-create-testing-database.sh'
-        networks:
-            - sail
-        healthcheck:
-            test:
-                - CMD
-                - mysqladmin
-                - ping
-                - '-p${DB_PASSWORD}'
-            retries: 3
-            timeout: 5s
-    mailpit:
-        image: 'axllent/mailpit:latest'
-        ports:
-            - '${FORWARD_MAILPIT_PORT:-1025}:1025'
-            - '${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025'
-        networks:
-            - sail
-    # pgsql:
-    #     image: 'postgres:15'
-    #     ports:
-    #         - '${FORWARD_DB_PORT:-5432}:5432'
-    #     environment:
-    #         PGPASSWORD: '${DB_PASSWORD:-secret}'
-    #         POSTGRES_DB: '${DB_DATABASE}'
-    #         POSTGRES_USER: '${DB_USERNAME}'
-    #         POSTGRES_PASSWORD: '${DB_PASSWORD:-secret}'
-    #     volumes:
-    #         - 'sail-pgsql:/var/lib/postgresql/data'
-    #         - './docker/pgsql/create-testing-database.sql:/docker-entrypoint-initdb.d/10-create-testing-database.sql'
-    #     networks:
-    #         - sail
-    #     healthcheck:
-    #         test:
-    #             - CMD
-    #             - pg_isready
-    #             - '-q'
-    #             - '-d'
-    #             - '${DB_DATABASE}'
-    #             - '-U'
-    #             - '${DB_USERNAME}'
-    #         retries: 3
-    #         timeout: 5s
-networks:
-    sail:
-        driver: bridge
+            - speedtest-db:/var/lib/mysql
 volumes:
-    sail-mysql:
-        driver: local
-    # sail-pgsql:
-    #     driver: local
+  speedtest-app:
+  speedtest-db:
+

From dbd838b4ac62bf380098c36b1e3de014bc49c12e Mon Sep 17 00:00:00 2001
From: MHUSXB66 <mhurstel@gmail.com>
Date: Wed, 10 Apr 2024 08:41:53 +0200
Subject: [PATCH 2/2] modif speedtest

---
 docker-compose.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1358d6592..e5b5e196e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.3'
 services:
     speedtest-tracker:
         container_name: speedtest-tracker
@@ -31,6 +30,13 @@ services:
             - MARIADB_RANDOM_ROOT_PASSWORD=true
         volumes:
             - speedtest-db:/var/lib/mysql
+    adminer:
+        restart: always
+        image: adminer:latest
+        ports:
+            - "8092:80"
+        depends_on:
+            - db
 volumes:
   speedtest-app:
   speedtest-db: