Merge pull request #422 from Websoft9/ruixian_1005

Ruixian 1005

apps/mautic/.env

@@ -1,17 +1,16 @@
 W9_POWER_PASSWO=UGz0IARz117ssO%
-
 W9_VERSION=latest
-W9_HTTP_PORT=9001
-W9_PASSWORD=$W9_POWER_PASSWO
-W9_NAME=mautic
-W9_NETWORK=websoft9
-
-W9_DB_MYSQL_VERSION=5.7
-W9_DB_MYSQL_PORT=3307
-W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO
-W9_DB_MYSQL_NAME=$W9_NAME
-W9_DB_MYSQL_USER=$mautic
+W9_REPO=mautic/mautic
+W9_ID=mautic
 
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=80
+W9_HTTP_PORT_SET=9001
+W9_NETWORK=websoft9
+W9_DIST=community
+W9_DB_EXPOSE="mysql"
+W9_PASSWORD=$W9_POWER_PASSWO
+#### --------------------------------------------------------------------------------------- ####
 
 MAUTIC_RUN_CRON_JOBS=true
 MAUTIC_TRUSTED_PROXIES=0.0.0.0/0

apps/mautic/docker-compose.yml

@@ -6,10 +6,10 @@ version: '3.8'
 
 services:
   mautic:
-    image: mautic/mautic:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     ports:
-      - ${W9_HTTP_PORT}:80
+      - ${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}
     volumes:
       - mautic:/var/www/html
     env_file:
@@ -18,27 +18,26 @@ services:
       # MAUTIC_DB_USER must root, otherwise container error
       - MAUTIC_DB_HOST=mysql
       - MAUTIC_DB_USER=root
-      - MAUTIC_DB_PASSWORD=${W9_DB_MYSQL_PASSWORD}
-      - MAUTIC_DB_NAME=${W9_DB_MYSQL_NAME}
+      - MAUTIC_DB_PASSWORD=${W9_POWER_PASSWO}
+      - MAUTIC_DB_NAME=${W9_ID}
     depends_on:
       - mysql
     restart: unless-stopped
 
 
   mysql:
-    image: mysql:${W9_DB_MYSQL_VERSION}
-    container_name: ${W9_NAME}-db
+    image: mysql:5.7
+    container_name: ${W9_ID}-mysql
     restart: unless-stopped
-    ports:
-     - ${W9_DB_MYSQL_PORT}:3306
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     volumes:
       - mysql:/var/lib/mysql
     environment:
-      MYSQL_DATABASE: ${W9_DB_MYSQL_NAME}
-      MYSQL_USER: ${W9_DB_MYSQL_USER}
-      MYSQL_PASSWORD: ${W9_DB_MYSQL_PASSWORD}
-      MYSQL_ROOT_PASSWORD: ${W9_DB_MYSQL_PASSWORD}
+      MYSQL_DATABASE: ${W9_ID}
+      MYSQL_USER: ${W9_ID}
+      MYSQL_PASSWORD: ${W9_POWER_PASSWO}
+      MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWO}
+    env_file: .env
 
 networks:
   default:

apps/mautic/variables.json

@@ -7,14 +7,6 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
         "latest"
       ]
     }

apps/memcached/.env

@@ -1,8 +1,16 @@
 W9_VERSION=latest
+W9_ID=memcached
+W9_REPO=memcached
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
 W9_DB_PORT=11211
-W9_PANEL_PORT=9090
-W9_NAME=memcached
+W9_PANEL_PORT=80
+W9_DB_PORT_SET=1234
+W9_PANEL_PORT_SET=9090
 W9_MEMORY=2048
+
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
+W9_URL=appname.example.com
+W9_DIST=community
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####

apps/memcached/docker-compose.yml

@@ -4,24 +4,25 @@
 version: '3.8'
 services:
   memcached:
-    image: memcached:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     restart: unless-stopped
     ports:
-     - '${W9_DB_PORT}:11211'
+     - '${W9_DB_PORT_SET}:${W9_DB_PORT}'
     env_file: .env
     command:
      - '-m ${W9_MEMORY}'
      - '-c ${W9_MEMORY}'
 
   memadmin:
     image: hatamiarash7/memcached-admin:latest
-    container_name: $W9_NAME-panel
+    container_name: $W9_ID-panel
     restart: unless-stopped
     ports:
-     - '$W9_PANEL_PORT:80'
+     - '$W9_PANEL_PORT_SET:$W9_PANEL_PORT'
     environment: 
      - 'MEMCACHED_HOST=memcached'
+    env_file: .env
 
 networks:
   default:

apps/memcached/variables.json

@@ -7,14 +7,6 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
         "latest"
       ]
     }

apps/metabase/.env

@@ -1,18 +1,18 @@
 W9_POWER_PASSWO=tfhdjX1vHiwGAi
-
-W9_DB_MYSQL_VERSION=5.7
-W9_DB_MYSQL_PORT=3306
-W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO
-W9_DB_MYSQL_NAME=metabase
-W9_DB_MYSQL_USER=root
-W9_USER=[email protected]
-W9_PASSWORD=$W9_POWER_PASSWO
+W9_REPO=metabase/metabase
 W9_NETWORK=websoft9
-W9_NAME=metabase
+W9_ID=metabase
 W9_VERSION=latest
-W9_HTTP_PORT=9001
+
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT_SET=9001
+W9_HTTP_PORT=3000
 W9_TIMEZONE=Asia/Shanghai
 W9_URL_REPLACE=false
 W9_URL=appname.example.com
+W9_DB_EXPOSE="mysql"
+W9_USER=[email protected]
+#### --------------------------------------------------------------------------------------- ####
+
 MB_DB_TYPE=mysql
 MB_DB_FILE="/metabase-data/metabase.db"

apps/metabase/docker-compose.yml

@@ -4,41 +4,39 @@
 version: '3.8'
 services:
   metabase:
-    image: metabase/metabase:$W9_VERSION
+    image: $W9_REPO:$W9_VERSION
     restart: unless-stopped
-    container_name: $W9_NAME
-    hostname: $W9_NAME
+    container_name: $W9_ID
+    hostname: $W9_ID
     volumes: 
      - /dev/urandom:/dev/random:ro
      - metabase-data:/metabase-data
      - metabase-plugins:/plugins
     ports:
-      - $W9_HTTP_PORT:3000
+      - '$W9_HTTP_PORT_SET:$W9_HTTP_PORT'
     privileged: true
     env_file: .env
     environment: 
       JAVA_TIMEZONE: $W9_TIMEZONE
-      MB_DB_DBNAME: $W9_DB_MYSQL_NAME
-      MB_DB_USER: $W9_DB_MYSQL_USER
-      MB_DB_PASS: $W9_DB_MYSQL_PASSWORD
-      MB_DB_HOST: $W9_NAME-db
+      MB_DB_DBNAME: $W9_ID
+      MB_DB_USER: root
+      MB_DB_PASS: $W9_POWER_PASSWO
+      MB_DB_HOST: $W9_ID-mysql
     depends_on: 
       - mysql
 
   mysql:
-    image: mysql:$W9_DB_MYSQL_VERSION
-    container_name: $W9_NAME-db
+    image: mysql:5.7
+    container_name: $W9_ID-mysql
     restart: unless-stopped
-    ports:
-     - $W9_DB_MYSQL_PORT:3306
     volumes:
      - mysql:/var/lib/mysql
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-time-zone=+8:00 --lower-case-table-names=1 --default-authentication-plugin=mysql_native_password
     environment:
-      MYSQL_ROOT_PASSWORD: $W9_DB_MYSQL_PASSWORD
-      MYSQL_DATABASE: $W9_DB_MYSQL_NAME
-      MYSQL_USERNAME: $W9_DB_MYSQL_USER
-      MYSQL_PASSWORD: $W9_DB_MYSQL_PASSWORD
+      MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWO
+      MYSQL_DATABASE: $W9_ID
+      MYSQL_USERNAME: root
+      MYSQL_PASSWORD: $W9_POWER_PASSWO
 
 volumes:
   mysql:

apps/metabase/variables.json

@@ -7,14 +7,6 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
         "latest"
       ]
     }

apps/minio/.env

@@ -1,10 +1,15 @@
 W9_POWER_PASSWO=UGz0IARz117ssO%
 W9_VERSION=RELEASE.2023-05-18T00-05-36Z
+W9_ID=minio
+W9_REPO=minio/minio
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_NETWORK=websoft9
 W9_API_PORT=9000
 W9_HTTP_PORT=9001
+W9_API_PORT_SET=9000
+W9_HTTP_PORT_SET=9001
 W9_USER=admin
 W9_PASSWORD=$W9_POWER_PASSWO
 W9_URL_REPLACE=true
 W9_URL=appname.example.com
-W9_NAME=minio
-W9_NETWORK=websoft9
+#### --------------------------------------------------------------------------------------- ####

apps/minio/docker-compose.yml

@@ -3,11 +3,11 @@
 version: '3.8'
 services:
   minio:
-    container_name: ${W9_NAME}
-    image: minio/minio:${W9_VERSION}
+    container_name: ${W9_ID}
+    image: ${W9_REPO}:${W9_VERSION}
     ports:
-      - ${W9_API_PORT}:9000
-      - ${W9_HTTP_PORT}:9001
+      - ${W9_API_PORT_SET}:${W9_API_PORT}
+      - ${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}
     restart: unless-stopped
     env_file: .env
     volumes:
@@ -16,7 +16,7 @@ services:
     environment:
       MINIO_ROOT_USER: ${W9_USER}
       MINIO_ROOT_PASSWORD: ${W9_PASSWORD}
-      MINIO_SERVER_URL: http://${W9_URL}:${W9_API_PORT}
+      MINIO_SERVER_URL: http://${W9_URL}:${W9_API_PORT_SET}
 
 networks:
   default:

apps/minio/variables.json

@@ -7,14 +7,7 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
+        "RELEASE.2023-05-18T00-05-36Z",
         "latest"
       ]
     }

apps/mongocompass/.env

@@ -1,9 +1,15 @@
 W9_POWER_PASSWO=EGProfkuyL3ogd
+W9_REPO=websoft9dev/mongocompass
 W9_VERSION=v1.31
-W9_HTTP_PORT=9091
-W9_NAME=mongocompass
+W9_ID=mongocompass
+
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+
+W9_HTTP_PORT=6901
+W9_HTTP_PORT_SET=9091
 W9_USER=kasm_user
-W9_PASSWORD=$W9_POWER_PASSWO
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
+W9_URL=appname.example.com
+W9_DB_EXPOSE="mongodb"
+#### --------------------------------------------------------------------------------------- ####

apps/mongocompass/docker-compose.yml

@@ -4,14 +4,14 @@ version: '3.8'
 
 services:
   mongocompass:
-    image: websoft9dev/mongocompass:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     restart: unless-stopped
     ports:
-      - '${W9_HTTP_PORT}:6901'
+      - '${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}'
     env_file: .env
     environment:
-      - VNC_PW=$W9_PASSWORD
+      - VNC_PW=$W9_POWER_PASSWO
 
   mongo:
     image: mongo

apps/mongocompass/variables.json

@@ -7,14 +7,7 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
+        "v1.31",
         "latest"
       ]
     }