Merge pull request #420 from Websoft9/ruixian_1305

Ruixian 1305
Websoft9 · Nov 29, 2023 · f515e74 · f515e74
2 parents 4d85536 + 0c0ed9b
commit f515e74
Show file tree

Hide file tree

Showing 30 changed files with 226 additions and 270 deletions.
diff --git a/apps/nextcloud/.env b/apps/nextcloud/.env
@@ -1,15 +1,14 @@
 W9_POWER_PASSWO=8dHZPFLFGoPXuC
-
-W9_NETWORK=websoft9
 W9_VERSION=26.0.1
-W9_HTTP_PORT=9001
-W9_NAME=nextcloud
+W9_ID=nextcloud
 
-W9_DB_MYSQL_VERSION=8.0
-W9_DB_MYSQL_PORT=3306
-W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO
-W9_DB_MYSQL_NAME=$W9_NAME
-W9_DB_MYSQL_USER=$W9_NAME
-W9_DB_REDIS_VERSION=6
+W9_REPO=nextcloud
+#### --  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_URL_REPLACE=false
-W9_URL=appname.example.com
+W9_URL=appname.example.com
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/nextcloud/docker-compose.yml b/apps/nextcloud/docker-compose.yml
@@ -4,37 +4,35 @@ version: '3.8'
 
 services:
   nextcloud:
-    image: nextcloud:${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:
       - nextcloud:/var/www/html
       - nextcloud-data:/var/www/html/data
     env_file: .env
     environment:
-      - MYSQL_PASSWORD=${W9_DB_MYSQL_PASSWORD}
-      - MYSQL_DATABASE=${W9_DB_MYSQL_NAME}
-      - MYSQL_USER=${W9_DB_MYSQL_USER}
-      - MYSQL_HOST=${W9_NAME}-db
+      - MYSQL_PASSWORD=${W9_POWER_PASSWO}
+      - MYSQL_DATABASE=${W9_ID}
+      - MYSQL_USER=${W9_ID}
+      - MYSQL_HOST=${W9_ID}-mysql
     links:
       - mysql
     restart: unless-stopped
 
   mysql:
-    image: mysql:${W9_DB_MYSQL_VERSION}
-    container_name: ${W9_NAME}-db
+    image: mysql:8.0
+    container_name: ${W9_ID}-mysql
     restart: unless-stopped
     command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
-    ports:
-     - ${W9_DB_MYSQL_PORT}:3306
     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}
 
 volumes:
   nextcloud:

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

diff --git a/apps/nextterminal/.env b/apps/nextterminal/.env
@@ -1,8 +1,14 @@
-W9_NAME=nextterminal
+W9_ID=nextterminal
 W9_VERSION=latest
-W9_HTTP_PORT=9001
 W9_USER=admin
 W9_PASSWORD=admin
+
+W9_REPO=dushixiang/next-terminal
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=8088
+W9_HTTP_PORT_SET=9001
+
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
+W9_URL=appname.example.com
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/nextterminal/docker-compose.yml b/apps/nextterminal/docker-compose.yml
@@ -6,26 +6,28 @@ version: '3.8'
 services:
   guacd:
     image: dushixiang/guacd:latest
-    container_name: ${W9_NAME}-guacd
+    container_name: ${W9_ID}-guacd
     volumes:
       - guacd:/usr/local/next-terminal/data
     restart:
       always
+    env_file: .env
 
   next-terminal:
-    image: dushixiang/next-terminal:$W9_VERSION
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:$W9_VERSION
+    container_name: ${W9_ID}
     environment:
       DB: sqlite
       GUACD_HOSTNAME: guacd
       GUACD_PORT: 4822
     ports:
-      - "${W9_HTTP_PORT}:8088"
+      - "${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}"
     volumes:
       - /etc/localtime:/etc/localtime
       - next_terminal:/usr/local/next-terminal/data
     restart:
       always
+    env_file: .env
 
 networks:
   default:

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

diff --git a/apps/nocobase/.env b/apps/nocobase/.env
@@ -1,15 +1,17 @@
 # COMMENT
 W9_POWER_PASSWO=UGz0IARz117ssO%
-
-W9_NAME=nocobase
+W9_ID=nocobase
 W9_VERSION=main
-W9_HTTP_PORT=9001
-W9_NETWORK=websoft9
 
-W9_USER=[email protected]
-W9_PASSWORD=admin123
+W9_REPO=nocobase/nocobase
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=80
+W9_HTTP_PORT_SET=9001
 
-W9_DB_MYSQL_VERSION=8
-W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO
-W9_DB_MYSQL_NAME=$W9_NAME
-W9_DB_MYSQL_USER=$W9_NAME
+W9_NETWORK=websoft9
+W9_URL_REPLACE=false
+W9_URL=appname.example.com
+W9_PASSWORD=admin123
+W9_DIST=community
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/nocobase/docker-compose.yml b/apps/nocobase/docker-compose.yml
@@ -6,35 +6,37 @@ version: '3.8'
 
 services:
   app:
-    image: nocobase/nocobase:$W9_VERSION
-    container_name: $W9_NAME
+    image: $W9_REPO:$W9_VERSION
+    container_name: $W9_ID
     restart: unless-stopped
     depends_on:
       - mysql
     environment:
       - DB_DIALECT=mysql
-      - DB_HOST=$W9_NAME-db
-      - DB_DATABASE=$W9_DB_MYSQL_NAME
-      - DB_USER=$W9_DB_MYSQL_USER
-      - DB_PASSWORD=$W9_DB_MYSQL_PASSWORD
+      - DB_HOST=$W9_ID-mysql
+      - DB_DATABASE=$W9_ID
+      - DB_USER=$W9_ID
+      - DB_PASSWORD=$W9_POWER_PASSWO
       - LOCAL_STORAGE_BASE_URL=/storage/uploads
     volumes:
       - nocobase:/app/nocobase/storage
     ports:
-      - "$W9_HTTP_PORT:80"
+      - "$W9_HTTP_PORT_SET:$W9_HTTP_PORT"
+    env_file: .env
 
   mysql:
     image: mysql:8
-    container_name: $W9_NAME-db
+    container_name: $W9_ID-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
     restart: unless-stopped
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     volumes:
      - mysql:/var/lib/mysql
+    env_file: .env
 
 networks:
   default:

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

diff --git a/apps/nocodb/.env b/apps/nocodb/.env
@@ -1,15 +1,16 @@
 # COMMENT
 W9_POWER_PASSWO=UGz0IARz117ssO%
-
-W9_NAME=nocodb
+W9_ID=nocodb
 W9_VERSION=latest
-W9_HTTP_PORT=9001
 
-W9_NETWORK=websoft9
+W9_REPO=nocodb/nocodb
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=8080
+W9_HTTP_PORT_SET=9001
 
-W9_DB_POSTGRESQL_VERSION=latest
-W9_DB_POSTGRESQL_PORT=5432
-W9_DB_POSTGRESQL_PASSWORD=123456
-W9_DB_POSTGRESQL_NAME=nocodb
-W9_DB_POSTGRESQL_USER=nocodb
-W9_DB_POSTGRESQL_HOST=db
+W9_NETWORK=websoft9
+W9_URL_REPLACE=false
+W9_URL=appname.example.com
+W9_DIST=community
+W9_DB_EXPOSE="postgresql"
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/nocodb/docker-compose.yml b/apps/nocodb/docker-compose.yml
@@ -8,27 +8,27 @@ services:
     depends_on:
       db:
         condition: service_healthy
-    image: nocodb/nocodb:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     ports:
-      - "${W9_HTTP_PORT}:8080"
+      - "${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}"
     restart: unless-stopped
     volumes: 
       - "nocodb:/usr/app/data"
     environment:
-      NC_DB: "pg://${W9_NAME}-postgre:5432?u=${W9_DB_POSTGRESQL_USER}&p=${W9_DB_POSTGRESQL_PASSWORD}&d=${W9_DB_POSTGRESQL_NAME}"
+      NC_DB: "pg://${W9_ID}-postgresql:5432?u=${W9_ID}&p=${W9_POWER_PASSWO}&d=${W9_ID}"
 
   db:
-    image: postgres:${W9_DB_POSTGRESQL_VERSION}
-    container_name: ${W9_NAME}-postgre
-    hostname: ${W9_NAME}-postgre
+    image: postgres:latest
+    container_name: ${W9_ID}-postgresql
+    hostname: ${W9_ID}-postgresql
     restart: unless-stopped
     volumes:
       - postgres:/var/lib/postgresql/data
     environment:
-      POSTGRES_PASSWORD: ${W9_DB_POSTGRESQL_PASSWORD}
-      POSTGRES_USER: ${W9_DB_POSTGRESQL_USER}
-      POSTGRES_DB: ${W9_DB_POSTGRESQL_NAME}
+      POSTGRES_PASSWORD: ${W9_POWER_PASSWO}
+      POSTGRES_USER: ${W9_ID}
+      POSTGRES_DB: ${W9_ID}
     healthcheck:
       test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
       interval: 10s

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

diff --git a/apps/nopcommerce/.env b/apps/nopcommerce/.env
@@ -1,11 +1,13 @@
 W9_POWER_PASSWO=spJNF09yzwWJaG!
 W9_VERSION=latest
-W9_HTTP_PORT=9001
-W9_NAME=nopcommerce
+W9_ID=nopcommerce
+
+W9_REPO=nopcommerceteam/nopcommerce
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=80
+W9_HTTP_PORT_SET=9001
 
-W9_DB_MYSQL_VERSION=5.7
-W9_DB_MYSQL_PORT=3306
-W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO
-W9_DB_MYSQL_NAME=$W9_NAME
-W9_DB_MYSQL_USER=$nopcommerce
 W9_NETWORK=websoft9
+W9_DIST=community
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####