Merge pull request #419 from Websoft9/ruixian_1405

Ruixian 1405
Websoft9 · Nov 29, 2023 · 36ddb42 · 36ddb42
2 parents f515e74 + 9c6d1c2
commit 36ddb42
Show file tree

Hide file tree

Showing 15 changed files with 100 additions and 128 deletions.
diff --git a/apps/oracle/.env b/apps/oracle/.env
@@ -4,15 +4,22 @@
 # when express edtion, version includes [latest,21.3.0-xe,18.4.0-xe]
 W9_POWER_PASSWO=X14eTpm7LjDGZT
 W9_VERSION=latest
-W9_NAME=oracle
-W9_NETWORK=websoft9
+W9_ID=oracle
 W9_USER=sys
+
+W9_REPO=container-registry.oracle.com/database/enterprise
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
 W9_EM_PORT=5500
+W9_EM_PORT_SET=5500
 W9_DB_PORT=1521
+W9_DB_PORT_SET=1521
+
+W9_NETWORK=websoft9
 W9_COMPOSE_UP=true
-W9_DB_ORACLE_PASSWORD=$W9_POWER_PASSWO
 W9_URL_REPLACE=false
 W9_URL=appname.example.com
+#### --------------------------------------------------------------------------------------- ####
+
 # envrionments for express and enterprise
 ORACLE_CHARACTERSET=AL32UTF8
 ORACLE_PWD=$W9_POWER_PASSWO
@@ -22,15 +29,9 @@ ORACLE_SID=ORCLCDB
 ORACLE_PDB=ORCLPDB1
 ORACLE_EDITION=enterprise
 ENABLE_ARCHIVELOG=false
-
-# optional environment
-# INIT_SGA_SIZE=1000
-# INIT_PGA_SIZE=5000
-
 # Below environments only for express references, can not be used for image
 ORACLE_EX_SID=XE
 ORACLE_EX_PDB=XEPDB1
 
 
 
-
diff --git a/apps/oracle/docker-compose.yml b/apps/oracle/docker-compose.yml
@@ -6,30 +6,30 @@ version: '3.8'
 services:
   oracleex:
     image: container-registry.oracle.com/database/express:${W9_VERSION}
-    container_name: ${W9_NAME}  
+    container_name: ${W9_ID}  
     env_file: .env
     volumes:
       - data:/opt/oracle/oradata
       - startup:/opt/oracle/scripts/startup
       - setup:/opt/oracle/scripts/setup 
     ports:
-      -  ${W9_DB_PORT}:1521
-      -  ${W9_EM_PORT}:5500
+      -  ${W9_DB_PORT_SET}:${W9_DB_PORT}
+      -  ${W9_EM_PORT_SET}:${W9_EM_PORT}
     restart: unless-stopped
     profiles:
       - express
 
   oracle:
-    image: container-registry.oracle.com/database/enterprise:${W9_VERSION}
-    container_name: ${W9_NAME}  
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}  
     env_file: .env
     volumes:
       - data:/opt/oracle/oradata
       - startup:/opt/oracle/scripts/startup
       - setup:/opt/oracle/scripts/setup 
     ports:
-      -  ${W9_DB_PORT}:1521
-      -  ${W9_EM_PORT}:5500
+      -  ${W9_DB_PORT_SET}:${W9_DB_PORT}
+      -  ${W9_EM_PORT_SET}:${W9_EM_PORT}
     restart: unless-stopped
     profiles:
       - enterprise

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

diff --git a/apps/plausible/.env b/apps/plausible/.env
@@ -1,16 +1,18 @@
 W9_POWER_PASSWO=uQ8E1wVTzG8SOk3!
 
-W9_NAME=plausible
+W9_ID=plausible
 W9_REPO=plausible/analytics
 W9_VERSION=v1.5
 
-W9_URL=appname.example.com
-W9_HTTP_PORT=9001
-W9_NETWORK=websoft9
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=8000
+W9_HTTP_PORT_SET=9001
 
-W9_DB_POSTGRES_PASSWORD=$W9_PASSWORD
-W9_DB_POSTGRES_NAME=$W9_NAME
-W9_DB_POSTGRES_USER=$W9_NAME
+W9_NETWORK=websoft9
+W9_URL=appname.example.com
+W9_DIST=community
+W9_DB_EXPOSE="postgresql"
+#### --------------------------------------------------------------------------------------- ####
 
 # from: https://github.com/plausible/hosting/blob/master/plausible-conf.env
 BASE_URL=http://$W9_URL

diff --git a/apps/plausible/docker-compose.yml b/apps/plausible/docker-compose.yml
@@ -8,36 +8,36 @@ services:
 
   plausible:
     image: $W9_REPO:$W9_VERSION
-    container_name: $W9_NAME
+    container_name: $W9_ID
     restart: unless-stopped
     command: sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"
     depends_on:
       - plausible_db
       - plausible_events_db
       - mail
     ports:
-      - $W9_HTTP_PORT:8000
+      - $W9_HTTP_PORT_SET:$W9_HTTP_PORT
     env_file:
       - .env
 
   mail:
     image: bytemark/smtp
-    container_name: $W9_NAME-mail
+    container_name: $W9_ID-mail
     restart: unless-stopped
 
   plausible_db:
     # supported versions are 12, 13, and 14
     image: postgres:14-alpine
-    container_name: $W9_NAME-db
+    container_name: $W9_ID-postgresql
     restart: unless-stopped
     volumes:
       - db-data:/var/lib/postgresql/data
     environment:
-      - POSTGRES_PASSWORD=$W9_DB_POSTGRES_PASSWOR
+      - POSTGRES_PASSWORD=$W9_POWER_PASSWO
 
   plausible_events_db:
     image: clickhouse/clickhouse-server:22.6-alpine
-    container_name: $W9_NAME-clickhouse
+    container_name: $W9_ID-clickhouse
     restart: unless-stopped
     volumes:
       - event-data:/var/lib/clickhouse
@@ -47,6 +47,8 @@ services:
       nofile:
         soft: 262144
         hard: 262144
+    env_file:
+      - .env
 
 networks:
   default:

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

diff --git a/apps/postgresql/.env b/apps/postgresql/.env
@@ -1,11 +1,13 @@
 W9_POWER_PASSWO=uQ8E1wVTzG8SOk3!
 W9_VERSION=15
-W9_NAME=postgres
+W9_ID=postgres
+W9_REPO=postgres
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
 W9_DB_POSTGRES_PORT=5432
-W9_DB_POSTGRES_NAME=$W9_NAME
-W9_DB_POSTGRES_USER=postgres
-W9_DB_POSTGRES_HOST=postgres
-W9_DB_POSTGRES_PASSWORD=$W9_POWER_PASSWO
+W9_DB_POSTGRES_PORT_SET=5432
+
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
+W9_URL=appname.example.com
+W9_DIST=community
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/postgresql/docker-compose.yml b/apps/postgresql/docker-compose.yml
@@ -3,18 +3,18 @@
 version: '3.8'
 services:
   postgres:
-    image: postgres:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     restart: unless-stopped
     ports:
-     - ${W9_DB_POSTGRES_PORT}:5432
+     - '${W9_DB_POSTGRES_PORT_SET}:${W9_DB_POSTGRES_PORT}'
     volumes:
       - postgres:/var/lib/postgresql/data
     env_file: .env
     environment:
-      POSTGRES_DB: ${W9_DB_POSTGRES_NAME}
-      POSTGRES_USER: ${W9_DB_POSTGRES_USER}
-      POSTGRES_PASSWORD: ${W9_DB_POSTGRES_PASSWORD}
+      POSTGRES_DB: ${W9_ID}
+      POSTGRES_USER: ${W9_ID}
+      POSTGRES_PASSWORD: ${W9_POWER_PASSWO}
 
 volumes:
   postgres:

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

diff --git a/apps/prestashop/.env b/apps/prestashop/.env
@@ -1,20 +1,22 @@
 W9_POWER_PASSWO=uQ8E1wVTzG8SOk3!
-W9_DB_MYSQL_VERSION=5.7
-W9_DB_MYSQL_PORT=3306
-W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO
-W9_DB_MYSQL_NAME=prestashop
-W9_DB_MYSQL_USER=prestashop
-W9_NETWORK=websoft9
 W9_VERSION=8
-W9_HTTP_PORT=9001
+W9_ID=prestashop
+W9_REPO=prestashop/prestashop
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=80
+W9_HTTP_PORT_SET=9001
+
 W9_USER=[email protected]
-W9_PASSWORD=$W9_POWER_PASSWO
-W9_NAME=prestashop
+W9_NETWORK=websoft9
 W9_URL_REPLACE=true
-W9_URL=appname.example.com:$W9_HTTP_PORT
+W9_URL=appname.example.com:$W9_HTTP_PORT_SET
+W9_DIST=community
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
 
 PS_DEMO_MODE=0
 PS_INSTALL_AUTO=1
 PS_HANDLE_DYNAMIC_DOMAIN=0
 PS_COUNTRY=GB
 PS_LANGUAGE=en
+
diff --git a/apps/prestashop/docker-compose.yml b/apps/prestashop/docker-compose.yml
@@ -5,39 +5,38 @@ version: '3.8'
 
 services:
   prestashop:
-    image: prestashop/prestashop:${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:
       - prestashop:/var/www/html
     env_file: .env
     environment:
       - PS_DOMAIN=${W9_URL}
-      - DB_SERVER=${W9_NAME}-db
-      - DB_USER=${W9_DB_MYSQL_USER}
-      - DB_PASSWD=${W9_DB_MYSQL_PASSWORD}
+      - DB_SERVER=${W9_ID}-mysql
+      - DB_USER=${W9_ID}
+      - DB_PASSWD=${W9_POWER_PASSWO}
       - DB_PREFIX=ps_
       - ADMIN_MAIL=${W9_USER}
-      - ADMIN_PASSWD=${W9_PASSWORD}
+      - ADMIN_PASSWD=${W9_POWER_PASSWO}
     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_data:/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:

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

diff --git a/apps/pydio/.env b/apps/pydio/.env
@@ -1,20 +1,22 @@
 W9_POWER_PASSWO=spJNF09yzwWJaG!
 
-W9_NETWORK=websoft9
-W9_NAME=pydio
+W9_ID=pydio
 W9_VERSION=latest
-W9_HTTP_PORT=9001
+W9_USER=admin
+W9_REPO=pydio/cells
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=8080
 W9_GRPC_PORT=33060
+W9_HTTP_PORT_SET=9001
+W9_GRPC_PORT_SET=33060
 
-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
-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_DIST=community
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
+
 
 # CELLS_SITE_EXTERNAL must set, otherwise it login failed
 CELLS_LOG_LEVEL=info