new template

Websoft9 · Dec 2, 2023 · 80aedc6 · 80aedc6
1 parent bde35bb
commit 80aedc6
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 40 deletions.
diff --git a/apps/kong/.env b/apps/kong/.env
@@ -1,14 +1,13 @@
 W9_POWER_PASSWORD=uQ8E1wVTzG8SOk3!
 W9_VERSION=latest
-W9_ID=kong
+W9_DIST=community
 W9_REPO=kong
 
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
-W9_NETWORK=websoft9
-W9_URL_REPLACE=false
+W9_ID=kong
 W9_URL=appname.example.com
 W9_DB_EXPOSE="postgresql"
-
 W9_HTTP_PORT=1337
 W9_HTTP_PORT_SET=9001
+W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
diff --git a/apps/matomo/.env b/apps/matomo/.env
@@ -1,14 +1,15 @@
 W9_POWER_PASSWORD=1PrLxExE45LsCT
-W9_ID=matomo
+W9_DIST=community
 W9_REPO=matomo
 W9_VERSION=4.14
+
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_ID=matomo
 W9_HTTP_PORT=80
 W9_HTTP_PORT_SET=9001
-W9_NETWORK=websoft9
-W9_URL_REPLACE=false
 W9_URL=appname.example.com
 W9_DB_EXPOSE="mysql"
+W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
 MATOMO_DATABASE_ADAPTER=mysql
 MATOMO_DATABASE_TABLES_PREFIX=matomo_

diff --git a/apps/mattermost/.env b/apps/mattermost/.env
@@ -2,15 +2,16 @@
 W9_POWER_PASSWORD=uQ8E1wVTzG8SOk3!
 W9_REPO=mattermost/mattermost-team-edition
 W9_VERSION=7.10
-W9_ID=mattermost
+W9_DIST=community
 
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_ID=mattermost
 W9_HTTP_PORT=8065
 W9_HTTP_PORT_SET=9001
 W9_URL_REPLACE=true
 W9_URL=appname.example.com:$W9_HTTP_PORT_SET
-W9_NETWORK=websoft9
 W9_DB_EXPOSE="postgresql"
+W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
 
 
@@ -22,4 +23,4 @@ POSTGRES_DB=$W9_DB_POSTGRESQL_DB
 
 MM_BLEVESETTINGS_INDEXDIR=/mattermost/bleve-indexes
 MM_SQLSETTINGS_DRIVERNAME=postgres
-MM_SQLSETTINGS_DATASOURCE=postgres://${W9_ID}:${W9_POWER_PASSWORD}@postgres:5432/${W9_ID}?sslmode=disable&connect_timeout=10
+MM_SQLSETTINGS_DATASOURCE=postgres://${W9_ID}:${W9_POWER_PASSWORD}@$W9_ID-postgresql:5432/${W9_ID}?sslmode=disable&connect_timeout=10
diff --git a/apps/mautic/.env b/apps/mautic/.env
@@ -1,15 +1,14 @@
 W9_POWER_PASSWORD=UGz0IARz117ssO%
 W9_VERSION=latest
 W9_REPO=mautic/mautic
-W9_ID=mautic
+W9_DIST=community
 
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_ID=mautic
 W9_HTTP_PORT=80
 W9_HTTP_PORT_SET=9001
-W9_NETWORK=websoft9
-W9_DIST=community
 W9_DB_EXPOSE="mysql"
-W9_PASSWORD=$W9_POWER_PASSWORD
+W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
 
 MAUTIC_RUN_CRON_JOBS=true

diff --git a/apps/mautic/docker-compose.yml b/apps/mautic/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - .env
     environment:
       # MAUTIC_DB_USER must root, otherwise container error
-      - MAUTIC_DB_HOST=mysql
+      - MAUTIC_DB_HOST=${W9_ID}-mysql
       - MAUTIC_DB_USER=root
       - MAUTIC_DB_PASSWORD=${W9_POWER_PASSWORD}
       - MAUTIC_DB_NAME=${W9_ID}

diff --git a/apps/mediawiki/.env b/apps/mediawiki/.env
@@ -3,24 +3,18 @@ W9_DIST=community
 W9_VERSION=latest
 W9_POWER_PASSWORD=8dHZPFLFGoPXuC
 
-W9_HTTP_PORT_SET=9001
-
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
-
 W9_ID=mediawiki
+W9_HTTP_PORT_SET=9001
 W9_HTTP_PORT=8080
 W9_USER=admin
 # at least 10 chars and not use common password
 W9_PASSWORD=$W9_POWER_PASSWORD
-
 W9_DB_EXPOSE="mysql"
-
 # Must use add port
 W9_URL=Inernet_IP:$W9_HTTP_PORT_SET
 W9_URL_REPLACE=true
-
 W9_NETWORK=websoft9
-
 #### ----------------------------------------------------------------------------------------- ####
 
 

diff --git a/apps/memcached/.env b/apps/memcached/.env
@@ -1,15 +1,14 @@
 W9_VERSION=latest
-W9_ID=memcached
 W9_REPO=memcached
+W9_DIST=community
+
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_ID=memcached
 W9_MEM_PORT=11211
-W9_PANEL_PORT=80
 W9_MEM_PORT_SET=1234
+W9_PANEL_PORT=80
 W9_PANEL_PORT_SET=9090
 W9_MEMORY=2048
-
-W9_NETWORK=websoft9
-W9_URL_REPLACE=false
 W9_URL=appname.example.com
-W9_DIST=community
+W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
diff --git a/apps/metabase/.env b/apps/metabase/.env
@@ -1,17 +1,17 @@
 W9_POWER_PASSWORD=tfhdjX1vHiwGAi
 W9_REPO=metabase/metabase
-W9_NETWORK=websoft9
-W9_ID=metabase
 W9_VERSION=latest
 
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_ID=metabase
 W9_HTTP_PORT_SET=9001
 W9_HTTP_PORT=3000
 W9_TIMEZONE=Asia/Shanghai
-W9_URL_REPLACE=false
 W9_URL=appname.example.com
 W9_DB_EXPOSE="mysql"
 W9_USER=[email protected]
+W9_PASSWORD=$W9_POWER_PASSWORD
+W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
 
 MB_DB_TYPE=mysql

diff --git a/apps/minio/.env b/apps/minio/.env
@@ -1,9 +1,10 @@
 W9_POWER_PASSWORD=UGz0IARz117ssO%
 W9_VERSION=RELEASE.2023-05-18T00-05-36Z
-W9_ID=minio
+W9_DIST=community
 W9_REPO=minio/minio
+
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
-W9_NETWORK=websoft9
+W9_ID=minio
 W9_API_PORT=9000
 W9_HTTP_PORT=9001
 W9_API_PORT_SET=9000
@@ -12,4 +13,5 @@ W9_USER=admin
 W9_PASSWORD=$W9_POWER_PASSWORD
 W9_URL_REPLACE=true
 W9_URL=appname.example.com
+W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
diff --git a/apps/mongocompass/.env b/apps/mongocompass/.env
@@ -1,15 +1,14 @@
 W9_POWER_PASSWORD=EGProfkuyL3ogd
 W9_REPO=websoft9dev/mongocompass
 W9_VERSION=v1.31
-W9_ID=mongocompass
 
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
-
-W9_HTTP_PORT=6901
-W9_HTTP_PORT_SET=9091
+W9_ID=mongocompass
+W9_HTTPS_PORT=6901
+W9_HTTPS_PORT=9091
 W9_USER=kasm_user
-W9_NETWORK=websoft9
-W9_URL_REPLACE=false
+W9_PASSWORD=$W9_POWER_PASSWORD
 W9_URL=appname.example.com
 W9_DB_EXPOSE="mongodb"
+W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
diff --git a/apps/mongocompass/docker-compose.yml b/apps/mongocompass/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     container_name: ${W9_ID}
     restart: unless-stopped
     ports:
-      - '${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}'
+      - '${W9_HTTPS_PORT_SET}:${W9_HTTPS_PORT}'
     env_file: .env
     environment:
       - VNC_PW=$W9_POWER_PASSWORD