Merge pull request #413 from Websoft9/ruixian_1905

1905
Websoft9 · Nov 28, 2023 · 205e7f0 · 205e7f0
2 parents 1396003 + 84c1c18
commit 205e7f0
Show file tree

Hide file tree

Showing 15 changed files with 104 additions and 113 deletions.
diff --git a/apps/typesense/.env b/apps/typesense/.env
@@ -1,10 +1,18 @@
 W9_POWER_PASSWO=spJNF09yzwWJaG!
 W9_VERSION=0.24.1
-W9_HTTP_PORT=8109
-W9_KEY=$W9_POWER_PASSWO
-W9_NAME=typesense
-W9_DATA_PATH=/data
+W9_ID=typesense
+
+W9_REPO=typesense/typesense
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=8108
+W9_HTTP_PORT_SET=8109
+
+W9_NETWORK=websoft9
 W9_ENABLE_CORS=True
+W9_DATA_PATH=/data
 W9_HOST=172.17.0.1
+W9_KEY=$W9_POWER_PASSWO
 W9_PROTOCOL=http
-W9_NETWORK=websoft9
+W9_DIST=community
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/typesense/docker-compose.yml b/apps/typesense/docker-compose.yml
@@ -7,8 +7,8 @@ version: "3.8"
 
 services:
   typesense:
-    image: typesense/typesense:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     restart: unless-stopped
     logging:
       driver: "json-file"
@@ -20,13 +20,14 @@ services:
       - TYPESENSE_DATA_DIR=${W9_DATA_PATH}
       - TYPESENSE_ENABLE_CORS=true
     ports:
-      - "${W9_HTTP_PORT}:8108"
+      - "${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}"
     volumes:
       - typesense:/data
+    env_file: .env
 
   docsearch-scraper:
     image: typesense/docsearch-scraper:latest
-    container_name: ${W9_NAME}-scraper
+    container_name: ${W9_ID}-scraper
     restart: unless-stopped
     logging:
       driver: "json-file"
@@ -63,6 +64,7 @@ services:
           "nb_hits":46250}
     depends_on:
       - typesense
+    env_file: .env
 
 networks:
   default:

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

diff --git a/apps/typo3/.env b/apps/typo3/.env
@@ -1,10 +1,16 @@
 W9_POWER_PASSWO=spJNF09yzwWJaG!
-W9_NAME=typo3
+W9_ID=typo3
 W9_VERSION=latest
-W9_HTTP_PORT=9001
 W9_NETWORK=websoft9
-W9_DB_MYSQL_VERSION=8
-W9_DB_MYSQL_PORT=3306
-W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO
-W9_DB_MYSQL_NAME=typo3
-W9_DB_MYSQL_USER=typo3
+
+W9_REPO=martinhelmich/typo3
+#### --  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
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/typo3/docker-compose.yml b/apps/typo3/docker-compose.yml
@@ -4,38 +4,38 @@ version: '3.8'
 
 services:
   typo3:
-    image: martinhelmich/typo3:${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:
       - typo3fileadmin:/var/www/html/fileadmin
       - typo3conf:/var/www/html/typo3conf
       - typo3uploads:/var/www/html/uploads
       - typo3temp:/var/www/html/typo3temp
     restart: unless-stopped
     environment:
-      TYPO3_DB_USER: ${W9_DB_MYSQL_USER}
-      TYPO3_DB_PASSWORD: ${W9_DB_MYSQL_PASSWORD}
+      TYPO3_DB_USER: ${W9_ID}
+      TYPO3_DB_PASSWORD: ${W9_POWER_PASSWO}
       TYPO3_DB_HOST: mysql
     command: bash -c "cat /my_cmd > /cmd.sh && chmod +x /cmd.sh && /cmd.sh"
     configs:
       - source: my_cmd
+    env_file: .env
 
   mysql:
-    image: mysql:${W9_DB_MYSQL_VERSION}
-    container_name: ${W9_NAME}-db
+    image: mysql:8
+    container_name: ${W9_ID}-mysql
     restart: unless-stopped
     command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci]
-    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}
+    env_file: .env
 
 networks:
   default:

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

diff --git a/apps/umami/.env b/apps/umami/.env
@@ -1,12 +1,15 @@
-W9_NAME=umami
+W9_ID=umami
+W9_POWER_PASSWO=spJNF09yzwWJaG!
 W9_REPO=docker.umami.dev/umami-software/umami
 W9_VERSION=postgresql-latest
 
-W9_HTTP_PORT=9001
-W9_NETWORK=websoft9
-
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=3000
+W9_HTTP_PORT_SET=9001
 
-W9_DB_POSTGRES_VERSION=15-alpine
-W9_DB_POSTGRES_PASSWORD=$W9_PASSWORD
-W9_DB_POSTGRES_NAME=$W9_NAME
-W9_DB_POSTGRES_USER=$W9_NAME
+W9_NETWORK=websoft9
+W9_URL_REPLACE=false
+W9_URL=appname.example.com
+W9_DIST=community
+W9_DB_EXPOSE="postgresql"
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/umami/docker-compose.yml b/apps/umami/docker-compose.yml
@@ -7,11 +7,11 @@ version: '3.8'
 services:
   umami:
     image: $W9_REPO:$W9_VERSION
-    container_name: $W9_NAME
+    container_name: $W9_ID
     env_file:
       - .env
     ports:
-      - $W9_HTTP_PORT:3000
+      - '$W9_HTTP_PORT_SET:$W9_HTTP_PORT'
     environment:
       DATABASE_URL: postgresql://umami:umami@db:5432/umami
       DATABASE_TYPE: postgresql
@@ -21,14 +21,15 @@ services:
     restart: unless-stopped
 
   db:
-    image: postgres:$W9_DB_POSTGRES_VERSION
+    image: postgres:15-alpine
     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:
       - ./src/schema.postgresql.sql:/docker-entrypoint-initdb.d/schema.postgresql.sql:ro
       - postgresql:/var/lib/postgresql/data
+    env_file: .env
 
 networks:
   default:

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

diff --git a/apps/vault/.env b/apps/vault/.env
@@ -1,4 +1,11 @@
 W9_VERSION=latest
-W9_HTTP_PORT=9001
-W9_NAME=vault
+W9_ID=vault
+
+W9_REPO=vault
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=8200
+W9_HTTP_PORT_SET=9001
+
 W9_NETWORK=websoft9
+W9_DIST=community
+#### --------------------------------------------------------------------------------------- ####
diff --git a/apps/vault/docker-compose.yml b/apps/vault/docker-compose.yml
@@ -5,12 +5,12 @@ version: '3.8'
 
 services:
   vault:
-    image: vault:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     cap_add: 
       - IPC_LOCK
     ports:
-      - '${W9_HTTP_PORT}:8200'
+      - '${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}'
     env_file:
       - .env
     environment:

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

diff --git a/apps/vtiger/.env b/apps/vtiger/.env
@@ -2,16 +2,19 @@ W9_POWER_PASSWO=EGProfkuyL3ogd
 
 # tag:latest image is not newest image, pushed a issue to author yet
 W9_VERSION=7.4.0
-W9_HTTP_PORT=9001
-W9_NAME=vtiger
+W9_ID=vtiger
+
+W9_REPO=websoft9dev/vtiger
+#### --  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_DB_MYSQL_VERSION=5.6
-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"
+#### --------------------------------------------------------------------------------------- ####
 
 VT_ADMIN_USER=$W9_USER
 VT_ADMIN_PASSWORD=$W9_POWER_PASSWO
diff --git a/apps/vtiger/docker-compose.yml b/apps/vtiger/docker-compose.yml
@@ -5,21 +5,21 @@ version: '3.8'
 services:
 
   vtiger:
-    image: websoft9dev/vtiger:${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}
     env_file: .env
     environment:
-      - MYSQL_DATABASE=${W9_DB_MYSQL_NAME}
-      - MYSQL_ROOT_PASSWORD=${W9_DB_MYSQL_PASSWORD}
-      - MYSQL_USER=${W9_DB_MYSQL_USER}
-      - MYSQL_PASSWORD=${W9_DB_MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${W9_ID}
+      - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWO}
+      - MYSQL_USER=${W9_ID}
+      - MYSQL_PASSWORD=${W9_POWER_PASSWO}
       - VTIGER_DB_HOST=mysql
-      - VTIGER_DB_USER=${W9_DB_MYSQL_USER}
-      - VTIGER_DB_DATABASE=${W9_DB_MYSQL_NAME}
-      - VTIGER_DB_PASSWORD=${W9_DB_MYSQL_PASSWORD}
+      - VTIGER_DB_USER=${W9_ID}
+      - VTIGER_DB_DATABASE=${W9_ID}
+      - VTIGER_DB_PASSWORD=${W9_POWER_PASSWO}
     volumes:
       - vtiger:/var/www/html
       - ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
@@ -30,19 +30,18 @@ services:
       - source: my_cmd
 
   mysql:
-    image: mysql:${W9_DB_MYSQL_VERSION}
-    container_name: ${W9_NAME}-db
+    image: mysql:5.6
+    container_name: ${W9_ID}-mysql
     restart: unless-stopped
     environment:
-      - MYSQL_DATABASE=${W9_DB_MYSQL_NAME}
-      - MYSQL_ROOT_PASSWORD=${W9_DB_MYSQL_PASSWORD}
-      - MYSQL_USER=${W9_DB_MYSQL_USER}
-      - MYSQL_PASSWORD=${W9_DB_MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${W9_ID}
+      - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWO}
+      - MYSQL_USER=${W9_ID}
+      - MYSQL_PASSWORD=${W9_POWER_PASSWO}
     command: --character-set-server=utf8 --collation-server=utf8_general_ci --sql_mode=NO_ENGINE_SUBSTITUTION --local_infile=ON
-    ports:
-      - ${W9_DB_MYSQL_PORT}:3306
     volumes:
       - mysql:/var/lib/mysql
+    env_file: .env
 
 volumes:
   mysql:

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