update discourse

Websoft9 · Dec 18, 2023 · 25e29a0 · 25e29a0
1 parent aee879d
commit 25e29a0
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 32 deletions.
diff --git a/apps/discourse/.env b/apps/discourse/.env
@@ -17,7 +17,7 @@ W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
 
 DISCOURSE_HOST=$W9_URL
-ALLOW_EMPTY_PASSWORD=yes
+ALLOW_EMPTY_PASSWORD=no
 
 # You can set SMTP after installation
 DISCOURSE_SMTP_HOST=smtp.gmail.com
@@ -26,10 +26,9 @@ [email protected]
 DISCOURSE_SMTP_PASSWORD=your_password
 DISCOURSE_SMTP_PROTOCOL=tls
 
-#ALLOW_EMPTY_PASSWORD=yes
 DISCOURSE_DATABASE_HOST=$W9_ID-postgresql
 DISCOURSE_DATABASE_PORT_NUMBER=5432
-DISCOURSE_DATABASE_USER=$W9_ID
+DISCOURSE_DATABASE_USER=postgres
 DISCOURSE_DATABASE_NAME=$W9_ID
 DISCOURSE_DATABASE_PASSWORD=$W9_POWER_PASSWORD
 

diff --git a/apps/discourse/Notes.md b/apps/discourse/Notes.md
@@ -2,6 +2,9 @@
 
 Discourse [official repo](https://github.com/discourse/discourse/blob/main/docs/INSTALL-cloud.md) is not simple docker compose install solution, so use [Bitnami install](https://hub.docker.com/r/bitnami/discourse)
 
+
+Bitnami PostgreSQL **POSTGRESQL_USERNAME** will set a no-root user, if not set, the default user **postgres** is root user
+
 ## FAQ
 
 #### Can I set SMTP on console?

diff --git a/apps/discourse/docker-compose.yml b/apps/discourse/docker-compose.yml
@@ -39,7 +39,6 @@ services:
     volumes:
       - 'postgresql_data:/bitnami/postgresql'
     environment:
-      - POSTGRESQL_USERNAME=$W9_ID
       - POSTGRESQL_DATABASE=$W9_ID
       - POSTGRESQL_PASSWORD=$W9_POWER_PASSWORD
 

diff --git a/apps/discuz/variables.json b/apps/discuz/variables.json
@@ -7,7 +7,7 @@
     {
       "dist": "community",
       "version": [
-        "v3.4.0"
+        "v3.5.0"
       ]
     }
   ],

diff --git a/apps/discuzq/Notes.md b/apps/discuzq/Notes.md
@@ -1,5 +1,8 @@
 # DiscuzQ
 
+官网：https://discuzq.icu/
+
+官方已经22个月没有更新 Docker 镜像，故本应用暂时停止维护
 
 ## 安装
 

diff --git a/apps/discuzq/variables.json b/apps/discuzq/variables.json
@@ -1,7 +1,7 @@
 {
   "name": "discuzq",
   "trademark": "DiscuzQ",
-  "release": true,
+  "release": false,
   "fork_url": "https://discuz.com/docs",
   "edition": [
     {

diff --git a/apps/dolibarr/.env b/apps/dolibarr/.env
@@ -11,6 +11,7 @@ W9_HTTP_PORT=80
 W9_LOGIN_USER=admin
 W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
 W9_DB_EXPOSE="mariadb"
+W9_MARIADB_VERSION=latest
 W9_URL=internet_ip
 W9_NETWORK=websoft9
 
@@ -28,10 +29,4 @@ DOLI_DB_USER=$W9_ID
 DOLI_DB_PASSWORD=$W9_POWER_PASSWORD
 DOLI_DB_NAME=$W9_ID
 DOLI_ADMIN_LOGIN=$W9_LOGIN_USER
-DOLI_ADMIN_PASSWORD=$W9_POWER_PASSWORD
-
-MARIADB_VERSION=latest
-MARIADB_DATABASE=$W9_ID
-MARIADB_USER=$W9_ID
-MARIADB_PASSWORD=$W9_POWER_PASSWORD
-MARIADB_ROOT_PASSWORD=$W9_POWER_PASSWORD
+DOLI_ADMIN_PASSWORD=$W9_POWER_PASSWORD
diff --git a/apps/dolibarr/docker-compose.yml b/apps/dolibarr/docker-compose.yml
@@ -9,23 +9,26 @@ services:
         container_name: $W9_ID
         restart: unless-stopped
         env_file: 
-            - .env
+          - .env
         ports:
-            - "$W9_HTTP_PORT_SET:80"
+          - "$W9_HTTP_PORT_SET:80"
         volumes:
-            - dolibarr_html:/var/www/html
-            - dolibarr_documents:/var/www/documents
+          - dolibarr_html:/var/www/html
+          - dolibarr_documents:/var/www/documents
         links:
             - mariadb
 
     mariadb:
-        image: mariadb:$MARIADB_VERSION
+        image: mariadb:$W9_MARIADB_VERSION
         container_name: $W9_ID-mariadb
         restart: unless-stopped
-        env_file: 
-            - .env
+        environment:
+          - MARIADB_DATABASE=$W9_ID
+          - MARIADB_USER=$W9_ID
+          - MARIADB_PASSWORD=$W9_POWER_PASSWORD
+          - MARIADB_ROOT_PASSWORD=$W9_POWER_PASSWORD
         volumes:
-            - mariadb:/var/lib/mysql
+          - mariadb:/var/lib/mysql
 
 networks:
   default:
@@ -35,4 +38,4 @@ networks:
 volumes:
   mariadb:
   dolibarr_html:
-  dolibarr_documents:
+  dolibarr_documents:
diff --git a/apps/drupal/.env b/apps/drupal/.env
@@ -14,6 +14,7 @@ W9_ADMIN_PATH="/user/login"
 
 # Container name's suffix must use one of the value
 W9_DB_EXPOSE="mysql"
+W9_MYSQL_VERSION="5.7"
 W9_URL=internet_ip
 W9_NETWORK=websoft9
 
@@ -25,10 +26,4 @@ DRUPAL_DATABASE_NAME=$W9_ID
 DRUPAL_USERNAME=$W9_LOGIN_USER
 DRUPAL_PASSWORD=$W9_POWER_PASSWORD
 DRUPAL_DATABASE_PORT_NUMBER=3306
-PHP_MEMORY_LIMIT=512M
-
-
-MYSQL_DATABASE=$W9_ID
-MYSQL_USER=$W9_ID
-MYSQL_PASSWORD=$W9_POWER_PASSWORD
-MYSQL_ROOT_PASSWORD=$W9_POWER_PASSWORD
+PHP_MEMORY_LIMIT=512M
diff --git a/apps/drupal/docker-compose.yml b/apps/drupal/docker-compose.yml
@@ -15,14 +15,18 @@ services:
     depends_on:
       - db
 
-  db:
-    image: mysql:5.7
+  mysql:
+    image: mysql:$W9_MYSQL_VERSION
     container_name: $W9_ID-mysql
     restart: unless-stopped
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     volumes:
       - mysql:/var/lib/mysql
-    env_file: .env
+    environment:
+      - MYSQL_DATABASE=$W9_ID
+      - MYSQL_USER=$W9_ID
+      - MYSQL_PASSWORD=$W9_POWER_PASSWORD
+      - MYSQL_ROOT_PASSWORD=$W9_POWER_PASSWORD
 
 networks:
   default:
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,9 @@ @@
     Discourse [official repo](https://github.com/discourse/discourse/blob/main/docs/INSTALL-cloud.md) is not simple docker compose install solution, so use [Bitnami install](https://hub.docker.com/r/bitnami/discourse)
+    Bitnami PostgreSQL **POSTGRESQL_USERNAME** will set a no-root user, if not set, the default user **postgres** is root user
     ## FAQ
     #### Can I set SMTP on console?
@@ Expand Down @@