Merge pull request #412 from Websoft9/ruixian_2003

2003
Websoft9 · Nov 28, 2023 · 87daf95 · 87daf95
2 parents 205e7f0 + 0641a1e
commit 87daf95
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 94 deletions.
diff --git a/apps/webmin/.env b/apps/webmin/.env
@@ -1,8 +1,16 @@
 W9_POWER_PASSWO=uQ8E1wVTzG8SOk3!
-W9_NAME=webmin
 W9_VERSION=latest
-W9_USER=root
-W9_PASSWORD=$W9_POWER_PASSWO
+W9_ID=webmin
+W9_REPO=websoft9dev/webmin
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=10000
+W9_HTTP_PORT_SET=10000
+
 W9_NETWORK=websoft9
+
+W9_USER=root
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
+W9_PASSWORD=$W9_POWER_PASSWO
+W9_URL=appname.example.com
+W9_DIST=community
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/webmin/docker-compose.yml b/apps/webmin/docker-compose.yml
@@ -5,13 +5,13 @@ version: '3.8'
 
 services:
   webmin:
-    image: websoft9dev/webmin:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     env_file: .env
     environment:
       - WEBMIN_PASSWORD=${W9_PASSWORD}
     ports:
-      - '10000:10000'
+      - '$W9_HTTP_PORT_SET:$W9_HTTP_PORT'
     restart: unless-stopped
 
 networks:

diff --git a/apps/webmin/variables.json b/apps/webmin/variables.json
@@ -7,14 +7,6 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
         "latest"
       ]
     }

diff --git a/apps/zabbix/.env b/apps/zabbix/.env
@@ -2,17 +2,18 @@ W9_POWER_PASSWO=uQ8E1wVTzG8SOk3!
 
 # 6.0 5.4 5.2 5.0 4.0 3.0
 W9_VERSION=6.2
-W9_HTTP_PORT=9001
-W9_NAME=zabbix
+W9_ID=zabbix
+
+W9_REPO=zabbix/zabbix-web-apache-mysql
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=8080
+W9_HTTP_PORT_SET=9001
+
+W9_NETWORK=websoft9
 W9_USER=Admin
 W9_PASSWORD=$W9_POWER_PASSWO
-W9_NETWORK=websoft9
 W9_URL_REPLACE=false
 W9_URL=appname.example.com
-W9_DB_MYSQL_VERSION=8.0
-W9_DB_MYSQL_PORT=3306
-W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO
-
-# Do not change the database name, which will result in a connection being refused
-W9_DB_MYSQL_NAME=zabbix
-W9_DB_MYSQL_USER=zabbix
+W9_DIST=community
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/zabbix/docker-compose.yml b/apps/zabbix/docker-compose.yml
@@ -6,7 +6,7 @@ version: '3.8'
 services:
  zabbix-server:
   image: zabbix/zabbix-server-mysql:ubuntu-${W9_VERSION}-latest
-  container_name: ${W9_NAME}-server
+  container_name: ${W9_ID}-server
   restart: unless-stopped
   ports:
    - "10051:10051"
@@ -38,11 +38,11 @@ services:
   env_file:
    - ./src/env_vars/.env_srv
   environment:
-   - DB_SERVER_HOST=$W9_NAME-db
-   - DB_SERVER_PORT=${W9_DB_MYSQL_PORT}
-   - MYSQL_ROOT_PASSWORD=${W9_DB_MYSQL_PASSWORD}
-   - MYSQL_PASSWORD=${W9_DB_MYSQL_PASSWORD}
-   - MYSQL_DATABASE=${W9_DB_MYSQL_NAME}
+   - DB_SERVER_HOST=$W9_ID-mysql
+   - DB_SERVER_PORT=3306
+   - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWO}
+   - MYSQL_PASSWORD=${W9_POWER_PASSWO}
+   - MYSQL_DATABASE=${W9_ID}
    - W9_PASSWORD=${W9_PASSWORD}
   depends_on:
    - mysql
@@ -67,11 +67,11 @@ services:
     - source: my_cmd
 
  zabbix-web-apache-mysql:
-  image: zabbix/zabbix-web-apache-mysql:ubuntu-${W9_VERSION}-latest
-  container_name: ${W9_NAME}-web
+  image: ${W9_REPO}:ubuntu-${W9_VERSION}-latest
+  container_name: ${W9_ID}-web
   restart: unless-stopped
   ports:
-   - "${W9_HTTP_PORT}:8080"
+   - "${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}"
   volumes:
    - /etc/localtime:/etc/localtime:ro
    - apache2:/etc/ssl/apache2:ro
@@ -86,10 +86,10 @@ services:
     reservations:
       memory: 256M
   environment:
-   - DB_SERVER_HOST=$W9_NAME-db
-   - DB_SERVER_PORT=${W9_DB_MYSQL_PORT}
-   - MYSQL_ROOT_PASSWORD=${W9_DB_MYSQL_PASSWORD}
-   - MYSQL_PASSWORD=${W9_DB_MYSQL_PASSWORD}
+   - DB_SERVER_HOST=$W9_ID-mysql
+   - DB_SERVER_PORT=3306
+   - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWO}
+   - MYSQL_PASSWORD=${W9_POWER_PASSWO}
   env_file:
    - ./src/env_vars/.env_web
   depends_on:
@@ -114,7 +114,7 @@ services:
 
  zabbix-agent:
   image: zabbix/zabbix-agent:ubuntu-${W9_VERSION}-latest
-  container_name: ${W9_NAME}-agent
+  container_name: ${W9_ID}-agent
   restart: unless-stopped
   ports:
    - "10050:10050"
@@ -147,7 +147,7 @@ services:
 
  zabbix-java-gateway:
   image: zabbix/zabbix-java-gateway:ubuntu-${W9_VERSION}-latest
-  container_name: ${W9_NAME}-java
+  container_name: ${W9_ID}-java
   restart: unless-stopped
   ports:
    - "10052:10052"
@@ -168,7 +168,7 @@ services:
 
  zabbix-snmptraps:
   image: zabbix/zabbix-snmptraps:ubuntu-${W9_VERSION}-latest
-  container_name: ${W9_NAME}-snmptraps
+  container_name: ${W9_ID}-snmptraps
   restart: unless-stopped
   ports:
    - "162:1162/udp"
@@ -186,13 +186,12 @@ services:
    com.zabbix.company: "Zabbix LLC"
    com.zabbix.component: "snmptraps"
    com.zabbix.os: "ubuntu"
+  env_file: .env
 
  mysql:
-  image: mysql:${W9_DB_MYSQL_VERSION}
-  container_name: ${W9_NAME}-db
+  image: mysql:8.0
+  container_name: ${W9_ID}-mysql
   restart: unless-stopped
-  ports: 
-   - ${W9_DB_MYSQL_PORT}:3306
   command:
    - mysqld
    - --character-set-server=utf8mb4
@@ -201,18 +200,19 @@ services:
   volumes:
    - mysql:/var/lib/mysql:rw
   environment: 
-   - DB_SERVER_HOST=$W9_NAME-db
-   - MYSQL_ROOT_PASSWORD=${W9_DB_MYSQL_PASSWORD}
-   - DB_SERVER_PORT=${W9_DB_MYSQL_PORT}
-   - MYSQL_USER=${W9_DB_MYSQL_USER}
-   - MYSQL_PASSWORD=${W9_DB_MYSQL_PASSWORD}
+   - DB_SERVER_HOST=$W9_ID-mysql
+   - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWO}
+   - DB_SERVER_PORT=3306
+   - MYSQL_USER=${W9_ID}
+   - MYSQL_PASSWORD=${W9_POWER_PASSWO}
   security_opt:
    - seccomp:unconfined
   stop_grace_period: 1m
+  env_file: .env
 
  db_data_mysql:
   image: busybox
-  container_name: ${W9_NAME}-data
+  container_name: ${W9_ID}-data
   volumes:
    - mysql:/var/lib/mysql:rw
 

diff --git a/apps/zabbix/variables.json b/apps/zabbix/variables.json
@@ -7,14 +7,7 @@
     {
       "dist": "community",
       "version": [
-        "18.8",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
+        "6.2",
         "latest"
       ]
     }

diff --git a/apps/zammad/.env b/apps/zammad/.env
@@ -1,8 +1,11 @@
 W9_POWER_PASSWO=UGz0IARz117ssO%
-IMAGE_REPO=zammad/zammad-docker-compose
-POSTGRES_PASS=$W9_POWER_PASSWO
-POSTGRES_USER=zammad
-RESTART=always
+W9_ID=zammad
 # don't forget to add the minus before the version
-VERSION=-4.1.0-6
+W9_VERSION=-4.1.0-6
+W9_REPO=zammad/zammad-docker-compose
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+
 W9_NETWORK=websoft9
+W9_RESTART=always
+W9_DIST=community
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/zammad/docker-compose.yml b/apps/zammad/docker-compose.yml
@@ -10,21 +10,21 @@ services:
     environment:
       - BACKUP_SLEEP=86400
       - HOLD_DAYS=10
-      - POSTGRESQL_USER=${POSTGRES_USER}
-      - POSTGRESQL_PASSWORD=${POSTGRES_PASS}
-    image: ${IMAGE_REPO}:zammad-postgresql${VERSION}
+      - POSTGRESQL_USER=${W9_ID}
+      - POSTGRESQL_PASSWORD=${W9_POWER_PASSWO}
+    image: ${W9_REPO}:zammad-postgresql${W9_VERSION}
     links:
       - zammad-postgresql
-    restart: ${RESTART}
+    restart: ${W9_RESTART}
     volumes:
       - zammad-backup:/var/tmp/zammad
       - zammad-data:/opt/zammad
 
   zammad-elasticsearch:
     environment:
       - discovery.type=single-node
-    image: ${IMAGE_REPO}:zammad-elasticsearch${VERSION}
-    restart: ${RESTART}
+    image: ${W9_REPO}:zammad-elasticsearch${W9_VERSION}
+    restart: ${W9_RESTART}
     volumes:
       - elasticsearch-data:/usr/share/elasticsearch/data
 
@@ -33,9 +33,9 @@ services:
     depends_on:
       - zammad-postgresql
     environment:
-      - POSTGRESQL_USER=${POSTGRES_USER}
-      - POSTGRESQL_PASS=${POSTGRES_PASS}
-    image: ${IMAGE_REPO}:zammad${VERSION}
+      - POSTGRESQL_USER=${W9_ID}
+      - POSTGRESQL_PASS=${W9_POWER_PASSWO}
+    image: ${W9_REPO}:zammad${W9_VERSION}
     links:
       - zammad-elasticsearch
       - zammad-postgresql
@@ -46,28 +46,28 @@ services:
   zammad-memcached:
     command: memcached -m 256M
     image: memcached:1.6.9-alpine
-    restart: ${RESTART}
+    restart: ${W9_RESTART}
 
   zammad-nginx:
     command: ["zammad-nginx"]
     expose:
       - "8080"
     depends_on:
       - zammad-railsserver
-    image: ${IMAGE_REPO}:zammad${VERSION}
+    image: ${W9_REPO}:zammad${W9_VERSION}
     links:
       - zammad-railsserver
       - zammad-websocket
-    restart: ${RESTART}
+    restart: ${W9_RESTART}
     volumes:
       - zammad-data:/opt/zammad
 
   zammad-postgresql:
     environment:
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASS}
-    image: ${IMAGE_REPO}:zammad-postgresql${VERSION}
-    restart: ${RESTART}
+      - W9_ID=${W9_ID}
+      - W9_POWER_PASSWOWORD=${W9_POWER_PASSWO}
+    image: ${W9_REPO}:zammad-postgresql${W9_VERSION}
+    restart: ${W9_RESTART}
     volumes:
       - postgresql-data:/var/lib/postgresql/data
 
@@ -76,12 +76,12 @@ services:
     depends_on:
       - zammad-memcached
       - zammad-postgresql
-    image: ${IMAGE_REPO}:zammad${VERSION}
+    image: ${W9_REPO}:zammad${W9_VERSION}
     links:
       - zammad-elasticsearch
       - zammad-memcached
       - zammad-postgresql
-    restart: ${RESTART}
+    restart: ${W9_RESTART}
     volumes:
       - zammad-data:/opt/zammad
 
@@ -90,12 +90,12 @@ services:
     depends_on:
       - zammad-memcached
       - zammad-railsserver
-    image: ${IMAGE_REPO}:zammad${VERSION}
+    image: ${W9_REPO}:zammad${W9_VERSION}
     links:
       - zammad-elasticsearch
       - zammad-memcached
       - zammad-postgresql
-    restart: ${RESTART}
+    restart: ${W9_RESTART}
     volumes:
       - zammad-data:/opt/zammad
 
@@ -104,11 +104,11 @@ services:
     depends_on:
       - zammad-memcached
       - zammad-railsserver
-    image: ${IMAGE_REPO}:zammad${VERSION}
+    image: ${W9_REPO}:zammad${W9_VERSION}
     links:
       - zammad-postgresql
       - zammad-memcached
-    restart: ${RESTART}
+    restart: ${W9_RESTART}
     volumes:
       - zammad-data:/opt/zammad
 

diff --git a/apps/zammad/variables.json b/apps/zammad/variables.json
@@ -7,14 +7,7 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
+        "-4.1.0-6",
         "latest"
       ]
     }