Added mailpit for email testing, perms for hostside editing and other configs

Author: ShiniDev

.env.example

@@ -1,3 +1,9 @@
+# id -u && id -g
+UID=1000 
+GID=1000
+
+DATABASE_TYPE="mysql"
+DATABASE_HOST="db"
 MYSQL_ROOT_PASSWORD="root"
 MYSQL_DATABASE="localdb"
 MYSQL_USER="admin"
@@ -6,4 +12,6 @@ MYSQL_PASSWORD="1234"
 REDIS_HOST="redis-stack"
 REDIS_PASSWORD="1234"
 REDIS_PORT="6379"
-REDIS_ARGS="--requirepass 1234"
+REDIS_ARGS="--requirepass 1234"
+
+XDG_CONFIG_HOME=/tmp/config

Caddyfile

@@ -1,7 +1,11 @@
-localhost {
+https://localhost {
+	redir http://localhost{uri}
+}
+
+http://localhost {
 	reverse_proxy nginx:80
 }
 
-pma.localhost {
+http://pma.localhost {
 	reverse_proxy phpmyadmin:80
-}
+}

compose.yml

@@ -20,6 +20,7 @@ services:
       - php-fpm
   php-fpm:
     build: ./build/php/
+    user: "${UID}:${GID}"
     restart: unless-stopped
     volumes:
       - ./src:/var/www/html
@@ -29,13 +30,15 @@ services:
     depends_on:
       - db
     environment:
-      DB_HOST: "db" # The db service
+      DB_CONNECTION: ${DATABASE_TYPE}
+      DB_HOST: ${DATABASE_HOST} # The db service
       DB_DATABASE: ${MYSQL_DATABASE}
       DB_USERNAME: ${MYSQL_USER}
       DB_PASSWORD: ${MYSQL_PASSWORD}
       REDIS_HOST: ${REDIS_HOST}
       REDIS_PASSWORD: ${REDIS_PASSWORD}
       REDIS_PORT: ${REDIS_PORT}
+      XDG_CONFIG_HOME: ${XDG_CONFIG_HOME}
   phpmyadmin:
     image: phpmyadmin/phpmyadmin
     environment:
@@ -44,6 +47,8 @@ services:
   db:
     image: mysql
     restart: always
+    volumes:
+      - ./config/mysql/my.cnf:/etc/mysql/my.cnf:ro
     environment:
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
       MYSQL_DATABASE: ${MYSQL_DATABASE}
@@ -58,14 +63,19 @@ services:
     working_dir: /app
     volumes:
       - ./src:/app
-  redis-stack:
-    image: redis/redis-stack:latest
+  # redis-stack:
+  #   image: redis/redis-stack:latest
+  #   ports:
+  #     - "8001:8001"
+  #   environment:
+  #     REDIS_ARGS: ${REDIS_ARGS}
+  #   volumes:
+  #     - redis_stack_data:/data
+  mailpit:
+    image: axllent/mailpit
+    restart: unless-stopped
     ports:
-      - "8001:8001"
-    environment:
-      REDIS_ARGS: ${REDIS_ARGS}
-    volumes:
-      - redis_stack_data:/data
+      - "8025:8025"
 
 volumes:
   caddy_data: