Merge pull request #417 from Websoft9/ruixian_1505

Ruixian 1505
Websoft9 · Nov 29, 2023 · c7a7a99 · c7a7a99
2 parents 36ddb42 + ff6331e
commit c7a7a99
Show file tree

Hide file tree

Showing 15 changed files with 83 additions and 86 deletions.
diff --git a/apps/rabbitmq/.env b/apps/rabbitmq/.env
@@ -1,12 +1,21 @@
 # rabbitmq with gui version format is 3.9-management, latest is management
 W9_POWER_PASSWO=uQ8E1wVTzG8SOk3!
-W9_VERSION=3.12
+W9_VERSION=3.12-management
+W9_ID=rabbitmq
+W9_REPO=rabbitmq
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
 W9_GUI_PORT=15672
 W9_MQ_PORT=5672
 W9_ER_PORT=4369
+W9_GUI_PORT_SET=15672
+W9_MQ_PORT_SET=5672
+W9_ER_PORT_SET=4369
+
 W9_USER=admin
 W9_PASSWORD=$W9_POWER_PASSWO
-W9_NAME=rabbitmq
+
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
+W9_URL=appname.example.com
+W9_DIST=community
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/rabbitmq/docker-compose.yml b/apps/rabbitmq/docker-compose.yml
@@ -5,14 +5,14 @@ version: '3.8'
 
 services:
   rabbitmq:
-    image: rabbitmq:${W9_VERSION}-management
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     restart: unless-stopped
     ports:
       # EXPOSE 4369 5671 5672 15691 15692 25672
-      - '${W9_ER_PORT}:4369'
-      - '${W9_MQ_PORT}:5672'
-      - '${W9_GUI_PORT}:15672'
+      - '${W9_ER_PORT_SET}:${W9_ER_PORT}'
+      - '${W9_MQ_PORT_SET}:${W9_MQ_PORT}'
+      - '${W9_GUI_PORT_SET}:${W9_GUI_PORT}'
     env_file: .env
     environment:
       - RABBITMQ_DEFAULT_USER=${W9_USER}

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

diff --git a/apps/redis/.env b/apps/redis/.env
@@ -1,11 +1,18 @@
 # when the container start, redis.conf will take effect immediately.
 # more about configure, such as: auth password, you can refer to redis.conf.
 
+W9_REPO=redis
 W9_VERSION=7.0
-W9_GUI_VERSION=latest
+W9_ID=redis
+
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
 W9_DB_PORT=6379
 W9_GUI_PORT=8001
-W9_NAME=redis
+W9_DB_PORT_SET=6379
+W9_GUI_PORT_SET=8001
+
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
+W9_URL=appname.example.com
+W9_DIST=community
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/redis/docker-compose.yml b/apps/redis/docker-compose.yml
@@ -5,23 +5,24 @@ version: '3.8'
 
 services:
   redis:
-    image: redis:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: $W9_REPO:${W9_VERSION}
+    container_name: ${W9_ID}
     restart: unless-stopped
     ports: 
-      - ${W9_DB_PORT}:6379
+      - ${W9_DB_PORT_SET}:${W9_DB_PORT}
     env_file: .env
     volumes:
       - ./src/redis.conf:/etc/redis.conf:ro
       - redis_data:/data
     entrypoint: ["redis-server", "/etc/redis.conf"] 
 
   redisinsight:
-    image: redislabs/redisinsight:${W9_GUI_VERSION}
-    container_name: ${W9_NAME}-gui
+    image: redislabs/redisinsight:latest
+    container_name: ${W9_ID}-gui
     restart: unless-stopped
     ports:
-      - "${W9_GUI_PORT}:8001"
+      - "${W9_GUI_PORT_SET}:${W9_GUI_PORT}"
+    env_file: .env
 
 networks:
   default:

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

diff --git a/apps/redisinsight/.env b/apps/redisinsight/.env
@@ -1,8 +1,15 @@
 # version tags refer to: https://hub.docker.com/r/redislabs/redisinsight
 W9_POWER_PASSWO=UGz0IARz117ssO%
 W9_VERSION=latest
-W9_HTTP_PORT=9091
-W9_NAME=redisinsight
+W9_ID=redisinsight
+
+W9_REPO=redislabs/redisinsight
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=8001
+W9_HTTP_PORT_SET=9091
+
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
 W9_URL=appname.example.com
+W9_DIST=community
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/redisinsight/docker-compose.yml b/apps/redisinsight/docker-compose.yml
@@ -6,12 +6,12 @@ version: '3.8'
 
 services:
   redisinsight:
-    image: redislabs/redisinsight:$W9_VERSION
-    container_name: $W9_NAME
+    image: $W9_REPO:$W9_VERSION
+    container_name: $W9_ID
     env_file:
       - .env
     ports:
-      - $W9_HTTP_PORT:8001
+      - '$W9_HTTP_PORT_SET:$W9_HTTP_PORT'
     volumes:
       - redisinsight:/db
     restart: unless-stopped

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

diff --git a/apps/redmine/.env b/apps/redmine/.env
@@ -1,14 +1,18 @@
 W9_POWER_PASSWO=uQ8E1wVTzG8SOk3!
 
-W9_HTTP_PORT=9001
-W9_NAME=redmine
+W9_ID=redmine
 W9_USER=admin
-W9_PASSWORD=$W9_POWER_PASSWO
 W9_VERSION=5.0
+
+W9_REPO=redmine
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=3000
+W9_HTTP_PORT_SET=9001
+
+W9_PASSWORD=$W9_POWER_PASSWO
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
 W9_URL=appname.example.com
-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_DIST=community
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/redmine/docker-compose.yml b/apps/redmine/docker-compose.yml
@@ -5,17 +5,17 @@ version: '3.8'
 services:
 
   redmine:
-    image: redmine:$W9_VERSION
-    container_name: $W9_NAME
+    image: $W9_REPO:$W9_VERSION
+    container_name: $W9_ID
     restart: unless-stopped
     ports:
-     - $W9_HTTP_PORT:3000
+     - '$W9_HTTP_PORT_SET:$W9_HTTP_PORT'
     volumes: 
      - redmine:/usr/src/redmine
     env_file: .env
     environment:
-      REDMINE_DB_MYSQL: $W9_NAME-db
-      REDMINE_DB_PASSWORD: $W9_DB_MYSQL_PASSWORD
+      REDMINE_DB_MYSQL: $W9_ID-mysql
+      REDMINE_DB_PASSWORD: $W9_POWER_PASSWO
       REDMINE_SECRET_KEY_BASE: supersecretkey
       REDMINE_PLUGINS_MIGRATE: "true"
       REDMINE_PASSWORD: $W9_PASSWORD
@@ -29,17 +29,17 @@ services:
       - source: my_cmd
 
   db:
-    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_ROOT_PASSWORD: $W9_DB_MYSQL_PASSWORD
-      MYSQL_DATABASE: $W9_DB_MYSQL_NAME
+      MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWO
+      MYSQL_DATABASE: $W9_ID
+    env_file: .env
+
 
 volumes:
   mysql:

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

diff --git a/apps/redpandaconsole/.env b/apps/redpandaconsole/.env
@@ -1,9 +1,14 @@
-W9_NAME=redpandaconsole
-W9_REPO=docker.redpanda.com/redpandadata/console
+W9_ID=redpandaconsole
 W9_VERSION=latest
+
+W9_REPO=docker.redpanda.com/redpandadata/console
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=3000
+W9_HTTP_PORT_SET=3000
+
 W9_NETWORK=websoft9
-# port, W9_PORT is need at leaset
-W9_HTTP_PORT=9001
+W9_DIST=community
+#### --------------------------------------------------------------------------------------- ####
 
 # This is kafka's port, it need otherwise, can not access UI
 KAFKA_BROKERS=host.docker.internal:9092
diff --git a/apps/redpandaconsole/docker-compose.yml b/apps/redpandaconsole/docker-compose.yml
@@ -7,12 +7,12 @@ version: '3.8'
 services:
   redpanda-console:
     image: $W9_REPO:$W9_VERSION
-    container_name: $W9_NAME
+    container_name: $W9_ID
     restart: unless-stopped
     env_file:
       - .env
     ports:
-      - "3000:3000"
+      - "$W9_HTTP_PORT_SET:$W9_HTTP_PORT"
 
 networks:
   default:

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