From 4f682e449f293005c73519d785cd0f7f000c4f70 Mon Sep 17 00:00:00 2001
From: ivan <egidarev.ie@dvfu.ru>
Date: Thu, 7 Aug 2025 22:10:59 +1000
Subject: [PATCH] fix nginx, add apache, volumes

---
 global/docker-compose.yml | 53 +++++++++++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/global/docker-compose.yml b/global/docker-compose.yml
index a73e7f7..7930524 100644
--- a/global/docker-compose.yml
+++ b/global/docker-compose.yml
@@ -23,26 +23,58 @@ services:
       - "8080:8080"     # Draw.io в браузере: http://host:8080
     restart: unless-stopped
 
+  apache:
+    image: httpd:2.4
+    ports:
+      - 8081:80
+    volumes:
+      - ./src:/usr/local/apache2/htdocs
+
+
   static-nginx:
     image: nginx:alpine
     container_name: nginx_static
     ports:
-      - "8081:8081"       # простой статический nginx без монтирования – откроется дефолтный index
+      - "8082:80"       # простой статический nginx без монтирования – откроется дефолтный index
     volumes:
       - ./nginx-site:/usr/share/nginx/html:ro
     restart: unless-stopped
 
   npm-app:
-    image: jc21/nginx-proxy-manager:latest
-    container_name: nginx_proxy_manager
-    ports:
-      - "81:81"  # админка (login: admin@example.com / password: changeme)
-      - "80:80"  # http proxy
-      - "443:443" # https proxy
-    volumes:
-      - npm_data:/data
-      - npm_letsencrypt:/etc/letsencrypt
+    image: 'jc21/nginx-proxy-manager:latest'
     restart: unless-stopped
+    ports:
+      # These ports are in format <host-port>:<container-port>
+      - '80:80' # Public HTTP Port
+      - '443:443' # Public HTTPS Port
+      - '81:81' # Admin Web Port
+      # Add any other Stream port you want to expose
+      # - '21:21' # FTP
+    environment:
+      # Mysql/Maria connection parameters:
+      DB_MYSQL_HOST: "docker-db-1"
+      DB_MYSQL_PORT: 3306
+      DB_MYSQL_USER: ${db_user}
+      DB_MYSQL_PASSWORD: ${db_password}
+      DB_MYSQL_NAME: "npm"
+      # Uncomment this if IPv6 is not enabled on your host
+      # DISABLE_IPV6: 'true'
+    volumes:
+      - ./npm_data:/data
+      - ./npm_letsencrypt:/etc/letsencrypt
+    depends_on:
+      - db
+
+  db:
+    image: 'jc21/mariadb-aria:latest'
+    restart: unless-stopped
+    environment:
+      MYSQL_DATABASE: 'npm'
+      MYSQL_USER:  ${db_user}
+      MYSQL_PASSWORD: ${db_password}
+      MARIADB_AUTO_UPGRADE: '1'
+    volumes:
+      - ./mysql:/var/lib/mysql
 
   gitea:
     image: gitea/gitea:latest
@@ -77,3 +109,4 @@ volumes:
   npm_letsencrypt:
   wireguard_data:
   nginx-site:
+  mysql: