Merge pull request #416 from Websoft9/ruixian_1605

1605
Websoft9 · Nov 29, 2023 · 8efddcd · 8efddcd
2 parents c7a7a99 + 3b3f7f8
commit 8efddcd
Show file tree

Hide file tree

Showing 15 changed files with 102 additions and 103 deletions.
diff --git a/apps/rethinkdb/.env b/apps/rethinkdb/.env
@@ -1,11 +1,20 @@
 W9_POWER_PASSWO=uQ8E1wVTzG8SOk3!
 
-W9_NAME=rethinkdb
+W9_ID=rethinkdb
 W9_VERSION=2.4
+W9_USER=admin
+W9_REPO=rethinkdb
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=8080
+W9_HTTP_PORT_SET=9090
 W9_CLIENT_PORT=28015
+W9_CLIENT_PORT_SET=28015
 W9_CLUSTER_PORT=29015
-W9_USER=admin
-W9_PASSWORD=$W9_POWER_PASSWO
+W9_CLUSTER_PORT_SET=29015
+
 W9_NETWORK=websoft9
+W9_PASSWORD=$W9_POWER_PASSWO
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
+W9_URL=appname.example.com
+W9_DIST=community
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/rethinkdb/docker-compose.yml b/apps/rethinkdb/docker-compose.yml
@@ -5,13 +5,13 @@ version: '3.8'
 
 services:
   rethinkdb:
-    image: rethinkdb:${W9_VERSION}
+    image: ${W9_REPO}:${W9_VERSION}
     container_name: rethinkdb
     restart: unless-stopped
     ports:
-     - 9090:8080
-     - ${W9_CLIENT_PORT}:28015
-     - ${W9_CLUSTER_PORT}:29015
+     - ${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}
+     - ${W9_CLIENT_PORT_SET}:${W9_CLIENT_PORT}
+     - ${W9_CLUSTER_PORT_SET}:${W9_CLUSTER_PORT}
     env_file: .env
     command:
       - /bin/bash

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

diff --git a/apps/rocketchat/.env b/apps/rocketchat/.env
@@ -1,11 +1,13 @@
-W9_DB_MONGODB_VERSION=4.0
-W9_DB_MONGODB_PORT=27017
-W9_DB_MONGODB_NAME=rocketchat
-W9_DB_MONGODB_USER=rocketchat
-W9_DB_MONGODB_HOST=rocketchat-mongo
 W9_VERSION=4.8
-W9_HTTP_PORT=9001
-W9_NAME=rocketchat
+W9_ID=rocketchat
+W9_REPO=rocket.chat
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=3000
+W9_HTTP_PORT_SET=9001
+
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
+W9_URL=appname.example.com
+W9_DIST=community
+W9_DB_EXPOSE="mongodb"
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/rocketchat/docker-compose.yml b/apps/rocketchat/docker-compose.yml
@@ -5,33 +5,36 @@ version: '3.8'
 
 services:
   rocketchat:
-    image: rocket.chat:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     ports:
-      - ${W9_HTTP_PORT}:3000
+      - ${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}
     volumes:
       - rocketchat:/app
     environment:
       - ROOT_URL=http://localhost
-      - MONGO_URL=mongodb://mongo:${W9_DB_MONGODB_PORT}/rocketchat?replicaSet=rs01
-      - MONGO_OPLOG_URL=mongodb://mongo:${W9_DB_MONGODB_PORT}/local?replicaSet=rs01
+      - MONGO_URL=mongodb://mongo:27017/rocketchat?replicaSet=rs01
+      - MONGO_OPLOG_URL=mongodb://mongo:27017/local?replicaSet=rs01
     depends_on:
       - mongo
     restart: unless-stopped
+    env_file: .env
 
   mongo:
-    image: mongo:${W9_DB_MONGODB_VERSION}
-    container_name: ${W9_NAME}-db
+    image: mongo:4.0
+    container_name: ${W9_ID}-mongodb
     restart: unless-stopped
     volumes:
       - mongo:/data/db
     command: mongod --smallfiles --oplogSize 128 --replSet rs01
+    env_file: .env
 
   mongo-init-replica:
-    image: mongo:${W9_DB_MONGODB_VERSION}
+    image: mongo:4.0
     command: 'mongo mongo/rocketchat --eval "rs.initiate({ _id: ''rs01'', members: [ { _id: 0, host: ''mongo:27017'' } ]})"'
     depends_on:
       - mongo
+    env_file: .env
 
 networks:
   default:

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

diff --git a/apps/scratch/.env b/apps/scratch/.env
@@ -1,4 +1,13 @@
-W9_HTTP_PORT=9001
-W9_NAME=scratch
+W9_ID=scratch
 W9_VERSION=v2.3.13
+
+W9_REPO=websoft9dev/scratch
+#### --  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_DIST=community
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/scratch/docker-compose.yml b/apps/scratch/docker-compose.yml
@@ -5,12 +5,12 @@ version: "3.8"
 
 services:
   scratch:
-    image: websoft9dev/scratch:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     restart: unless-stopped
     env_file: .env
     ports:
-      - "${W9_HTTP_PORT}:80"
+      - "${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}"
     volumes:
       - scratch:/usr/share/nginx/html
 networks:

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

diff --git a/apps/seafile/.env b/apps/seafile/.env
@@ -1,16 +1,18 @@
 W9_POWER_PASSWO=uQ8E1wVTzG8SOk3!
-W9_DB_MARIADB_VERSION=10.5
-W9_DB_MARIADB_PORT=3306
-W9_DB_MARIADB_PASSWORD=$W9_POWER_PASSWO
-DB_MEMCACHED_VERSION=1.6
-DB_ELASTICSEARCH_VERSION=5.6.16
 
 W9_VERSION=10.0.1
-W9_HTTP_PORT=9001
+W9_ID=seafile
+W9_TIME_ZONE=Etc/UTC
+W9_REPO=seafileltd/seafile-mc
+#### --  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_USER=[email protected]
 W9_PASSWORD=$W9_POWER_PASSWO
-W9_NAME=seafile
-W9_TIME_ZONE=Etc/UTC
 W9_URL_REPLACE=true
 W9_URL=appname.example.com
-W9_NETWORK=websoft9
+W9_DIST=community
+W9_DB_EXPOSE="mariadb"
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/seafile/docker-compose.yml b/apps/seafile/docker-compose.yml
@@ -1,26 +1,26 @@
 version: "3.8"
 services:
   db:
-    image: mariadb:$W9_DB_MARIADB_VERSION
-    container_name: $W9_NAME-db
+    image: mariadb:10.5
+    container_name: $W9_ID-mariadb
     restart: unless-stopped
-    ports:
-      - $W9_DB_MARIADB_PORT:3306
     environment:
-      - MYSQL_ROOT_PASSWORD=$W9_DB_MARIADB_PASSWORD
+      - MYSQL_ROOT_PASSWORD=$W9_POWER_PASSWO
       - MYSQL_LOG_CONSOLE=true
     volumes:
       - mysql_data:/var/lib/mysql
+    env_file: .env
 
   memcached:
-    image: memcached:$DB_MEMCACHED_VERSION
-    container_name: $W9_NAME-memcached
+    image: memcached:1.6
+    container_name: $W9_ID-memcached
     restart: unless-stopped
     entrypoint: memcached -m 256
+    env_file: .env
 
   elasticsearch:
-    image: seafileltd/elasticsearch-with-ik:$DB_ELASTICSEARCH_VERSION
-    container_name: $W9_NAME-elasticsearch
+    image: seafileltd/elasticsearch-with-ik:5.6.16
+    container_name: $W9_ID-elasticsearch
     restart: unless-stopped
     environment:
       - discovery.type=single-node
@@ -38,20 +38,21 @@ services:
       - elasticsearch_data:/usr/share/elasticsearch/data # Requested, specifies the path to Elasticsearch data persistent store.
     profiles:
       - pro
+    env_file: .env
 
   seafile-pro:
     image: docker.seafile.top/seafileltd/seafile-pro-mc:$W9_VERSION
-    container_name: $W9_NAME
+    container_name: $W9_ID
     restart: unless-stopped
     ports:
-      - "$W9_HTTP_PORT:80"
+      - "$W9_HTTP_PORT_SET:$W9_HTTP_PORT"
     #     - "443:443"  # If https is enabled, cancel the comment.
     volumes:
       - seafile_data:/shared # Requested, specifies the path to Seafile data persistent store.
     env_file: .env
     environment:
-      - DB_HOST=$W9_NAME-db
-      - DB_ROOT_PASSWD=$W9_DB_MARIADB_PASSWORD
+      - DB_HOST=$W9_ID-db
+      - DB_ROOT_PASSWD=$W9_POWER_PASSWO
       - TIME_ZONE=$W9_TIME_ZONE
       - SEAFILE_ADMIN_EMAIL=$W9_USER
       - SEAFILE_ADMIN_PASSWORD=$W9_PASSWORD
@@ -65,18 +66,18 @@ services:
       - pro
 
   seafile-ce:
-    image: seafileltd/seafile-mc:$W9_VERSION
-    container_name: $W9_NAME
+    image: $W9_REPO:$W9_VERSION
+    container_name: $W9_ID
     restart: unless-stopped
     ports:
-      - "$W9_HTTP_PORT:80"
+      - "$W9_HTTP_PORT_SET:$W9_HTTP_PORT"
     #     - "443:443"  # If https is enabled, cancel the comment.
     volumes:
       - seafile_data:/shared # Requested, specifies the path to Seafile data persistent store.
     env_file: .env
     environment:
-      - DB_HOST=$W9_NAME-db
-      - DB_ROOT_PASSWD=$W9_DB_MARIADB_PASSWORD
+      - DB_HOST=$W9_ID-db
+      - DB_ROOT_PASSWD=$W9_POWER_PASSWO
       - TIME_ZONE=$W9_TIME_ZONE
       - SEAFILE_ADMIN_EMAIL=$W9_USER
       - SEAFILE_ADMIN_PASSWORD=$W9_PASSWORD

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

diff --git a/apps/sqlserver/.env b/apps/sqlserver/.env
@@ -1,10 +1,18 @@
 W9_POWER_PASSWO=spJNF09yzwWJaG!
-W9_DB_PORT=1433
 W9_USER=sa
-W9_PASSWORD=$W9_POWER_PASSWO
 W9_VERSION=2022
 W9_PID=Express
-W9_NAME=sqlserver
+W9_ID=sqlserver
+
+W9_REPO=mcr.microsoft.com/mssql/server
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_DB_PORT=1433
+W9_DB_PORT_SET=1433
+
+W9_PASSWORD=$W9_POWER_PASSWO
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
+W9_URL=appname.example.com
+W9_DIST=community
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/sqlserver/docker-compose.yml b/apps/sqlserver/docker-compose.yml
@@ -5,15 +5,15 @@ version: "3.8"
 
 services:
   db:
-    image: mcr.microsoft.com/mssql/server:${W9_VERSION}-latest
-    container_name: ${W9_NAME}
+    image: $W9_REPO:${W9_VERSION}-latest
+    container_name: ${W9_ID}
     env_file: .env
     environment:
       - ACCEPT_EULA=Y
       - SA_PASSWORD=${W9_PASSWORD}
       - MSSQL_PID=${W9_PID}
     ports:
-      - ${W9_DB_PORT}:1433
+      - ${W9_DB_PORT_SET}:${W9_DB_PORT}
     volumes:
       - mssql_data:/var/opt/mssql
     restart: unless-stopped

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