From 140c255bac862368712d2fcbbcabf3c474f0575e Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Sun, 31 Dec 2023 10:00:08 +0800
Subject: [PATCH] fix

---
 apps/vault/.env                |  7 +++----
 apps/vtiger/.env               | 16 ++++++++--------
 apps/vtiger/docker-compose.yml | 13 +++----------
 apps/webmin/.env               | 11 ++++-------
 apps/webmin/docker-compose.yml |  2 +-
 apps/zabbix/.env               | 12 ++++++------
 apps/zabbix/docker-compose.yml |  6 +++---
 apps/zammad/.env               |  2 +-
 apps/zammad/docker-compose.yml |  4 ++--
 9 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/apps/vault/.env b/apps/vault/.env
index 5d029b869..e16f74737 100644
--- a/apps/vault/.env
+++ b/apps/vault/.env
@@ -1,12 +1,11 @@
 # This image have no latest
 W9_VERSION=1.13.3
-W9_ID=vault
-
+W9_DIST=community
 W9_REPO=vault
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_ID=vault
 W9_HTTP_PORT=8200
 W9_HTTP_PORT_SET=9001
-
+W9_URL=appname.example.com
 W9_NETWORK=websoft9
-W9_DIST=community
 #### --------------------------------------------------------------------------------------- ####
diff --git a/apps/vtiger/.env b/apps/vtiger/.env
index 747af0c0a..e01cdcb3d 100644
--- a/apps/vtiger/.env
+++ b/apps/vtiger/.env
@@ -1,19 +1,19 @@
-W9_POWER_PASSWORD=EGProfkuyL3ogd
-
 # tag:latest image is not newest image, pushed a issue to author yet
 W9_VERSION=7.4.0
-W9_ID=vtiger
-
 W9_REPO=websoft9dev/vtiger
+W9_DIST=community
+
+W9_POWER_PASSWORD=EGProfkuyL3ogd
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_ID=vtiger
 W9_HTTP_PORT=80
 W9_HTTP_PORT_SET=9001
-
-W9_NETWORK=websoft9
-W9_URL_REPLACE=false
 W9_URL=appname.example.com
-W9_DIST=community
+W9_LOGIN_USER=admin
+W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
 W9_DB_EXPOSE="mysql"
+W9_DB_VERSION="5.6"
+W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
 
 VT_ADMIN_USER=$W9_LOGIN_USER
diff --git a/apps/vtiger/docker-compose.yml b/apps/vtiger/docker-compose.yml
index 2a0a4ce64..8ffeaace5 100644
--- a/apps/vtiger/docker-compose.yml
+++ b/apps/vtiger/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWORD}
       - MYSQL_USER=${W9_ID}
       - MYSQL_PASSWORD=${W9_POWER_PASSWORD}
-      - VTIGER_DB_HOST=mysql
+      - VTIGER_DB_HOST=${W9_ID}-mysql
       - VTIGER_DB_USER=${W9_ID}
       - VTIGER_DB_DATABASE=${W9_ID}
       - VTIGER_DB_PASSWORD=${W9_POWER_PASSWORD}
@@ -25,12 +25,9 @@ services:
       - ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
     depends_on:
       - mysql
-    command: bash -c "cat /my_cmd > /mycmd.sh && chmod +x /mycmd.sh && /mycmd.sh"
-    configs:
-      - source: my_cmd
 
   mysql:
-    image: mysql:5.6
+    image: mysql:$W9_DB_VERSION
     container_name: ${W9_ID}-mysql
     restart: unless-stopped
     environment:
@@ -41,7 +38,6 @@ services:
     command: --character-set-server=utf8 --collation-server=utf8_general_ci --sql_mode=NO_ENGINE_SUBSTITUTION --local_infile=ON
     volumes:
       - mysql:/var/lib/mysql
-    env_file: .env
 
 volumes:
   mysql:
@@ -50,7 +46,4 @@ volumes:
 networks:
   default:
     name: ${W9_NETWORK}
-    external: true
-configs:
-  my_cmd:
-    file: ./cmd.sh
+    external: true
\ No newline at end of file
diff --git a/apps/webmin/.env b/apps/webmin/.env
index 3d03613c9..e44f9997f 100644
--- a/apps/webmin/.env
+++ b/apps/webmin/.env
@@ -1,16 +1,13 @@
-W9_POWER_PASSWORD=uQ8E1wVTzG8SOk3!
 W9_VERSION=latest
-W9_ID=webmin
+W9_DIST=community
 W9_REPO=websoft9dev/webmin
+W9_POWER_PASSWORD=uQ8E1wVTzG8SOk3!
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_ID=webmin
 W9_HTTP_PORT=10000
 W9_HTTP_PORT_SET=10000
-
-W9_NETWORK=websoft9
-
 W9_LOGIN_USER=root
-W9_URL_REPLACE=false
 W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
 W9_URL=appname.example.com
-W9_DIST=community
+W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
\ No newline at end of file
diff --git a/apps/webmin/docker-compose.yml b/apps/webmin/docker-compose.yml
index 3b4d8e35a..ef7c06da2 100644
--- a/apps/webmin/docker-compose.yml
+++ b/apps/webmin/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     environment:
       - WEBMIN_PASSWORD=${W9_LOGIN_PASSWORD}
     ports:
-      - '$W9_HTTP_PORT_SET:$W9_HTTP_PORT'
+      - $W9_HTTP_PORT_SET:10000
     restart: unless-stopped
 
 networks:
diff --git a/apps/zabbix/.env b/apps/zabbix/.env
index 000025127..503c57ac2 100644
--- a/apps/zabbix/.env
+++ b/apps/zabbix/.env
@@ -1,16 +1,16 @@
-W9_POWER_PASSWORD=uQ8E1wVTzG8SOk3!
 W9_VERSION=6.2
-W9_ID=zabbix
-
 W9_REPO=zabbix/zabbix-web-apache-mysql
+W9_DIST=community
+W9_POWER_PASSWORD=uQ8E1wVTzG8SOk3!
+
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_ID=zabbix
 W9_HTTP_PORT=8080
 W9_HTTP_PORT_SET=9001
-
-W9_NETWORK=websoft9
 W9_LOGIN_USER=Admin
 W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
 W9_URL=appname.example.com
-W9_DIST=community
 W9_DB_EXPOSE="mysql"
+W9_DB_VERSION="8.0"
+W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
\ No newline at end of file
diff --git a/apps/zabbix/docker-compose.yml b/apps/zabbix/docker-compose.yml
index 17ec6fcd9..2680e51d1 100644
--- a/apps/zabbix/docker-compose.yml
+++ b/apps/zabbix/docker-compose.yml
@@ -68,10 +68,10 @@ services:
  
  zabbix-web-apache-mysql:
   image: ${W9_REPO}:ubuntu-${W9_VERSION}-latest
-  container_name: ${W9_ID}-web
+  container_name: ${W9_ID}
   restart: unless-stopped
   ports:
-   - "${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}"
+   - ${W9_HTTP_PORT_SET}:8080
   volumes:
    - /etc/localtime:/etc/localtime:ro
    - apache2:/etc/ssl/apache2:ro
@@ -189,7 +189,7 @@ services:
   env_file: .env
 
  mysql:
-  image: mysql:8.0
+  image: mysql:$W9_DB_VERSION
   container_name: ${W9_ID}-mysql
   restart: unless-stopped
   command:
diff --git a/apps/zammad/.env b/apps/zammad/.env
index ee10b0067..f2fc85fa3 100644
--- a/apps/zammad/.env
+++ b/apps/zammad/.env
@@ -12,7 +12,7 @@ W9_HTTP_PORT=8080
 W9_LOGIN_USER=admin
 W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
 W9_DB_EXPOSE="postgresql"
-W9_DB_VERSION=""
+W9_DB_VERSION="15.3"
 W9_URL=""
 W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
diff --git a/apps/zammad/docker-compose.yml b/apps/zammad/docker-compose.yml
index 1b303981e..f2ba147c6 100644
--- a/apps/zammad/docker-compose.yml
+++ b/apps/zammad/docker-compose.yml
@@ -96,7 +96,7 @@ services:
     container_name: $W9_ID
     command: ["zammad-nginx"]
     ports:
-      - $W9_HTTP_PORT_SET:$W9_HTTP_PORT
+      - $W9_HTTP_PORT_SET:8080
     expose:
       - "8080"
     depends_on:
@@ -110,7 +110,7 @@ services:
       POSTGRES_DB: ${POSTGRES_DB}
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASS}
-    image: postgres:${POSTGRES_VERSION}
+    image: postgres:${W9_DB_VERSION}
     restart: ${RESTART}
     volumes:
       - postgresql-data:/var/lib/postgresql/data