Merge pull request #1256 from Websoft9/update-wikijs-dd877da4

Update wikijs

Author: qiaofeng1227

apps/wikijs/.env

@@ -1,47 +1,28 @@
-W9_REPO=wordpress
-W9_DIST=community
-W9_VERSION=latest
-
-W9_POWER_PASSWORD=1PrMxExC45LsCT
+W9_REPO=ghcr.io/requarks/wiki
+W9_DIST='community'
+W9_VERSION='latest'
+W9_POWER_PASSWORD='!OWCxOHHnQ69aM5f'
 
 # Environments which for user settings when create application
 # Named expression: W9_xxx_xxx_SET, xxx refer to file fields
-W9_HTTP_PORT_SET=9001
-# W9_HTTPS_PORT_SET=9002
-# W9_DB_PORT_SET=3306
-# W9_SSH_PORT_SET=23
-W9_KEY_SET="dfsjdkjf77xjxcjcj"
+W9_HTTP_PORT_SET='9001'
 
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
-
-W9_ID=wikijs
+W9_ID='wikijs'
 
 # W9_HTTP_PORT or W9_HTTPS_PORT is need at leaset and used for proxy for web application
 # Some container (e.g teleport) need HTTPS access, then need to set this pra
-W9_HTTP_PORT=80
-W9_HTTPS_PORT=81
-
-W9_LOGIN_USER=admin
-# use https://1password.com/zh-cn/password-generator/  to genarate 14 bit password
-# this password can also use password file
-W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
-W9_ADMIN_PATH="/wp-login"
+W9_HTTP_PORT=3000
 
 # Container name's suffix must use one of the value
-W9_DB_EXPOSE="mysql,postgresql,mariadb,mongodb,redis"
+W9_DB_EXPOSE="postgresql"
 
 # It is used when the application APP needs to set an external URL, which can be IP(or domain), IP:PORT
 # If have protocols, should be set it in the APP's ENV
-W9_URL=internet_ip:$W9_HTTP_PORT_SET
-# modifies W9_URL on init when it is true
-W9_URL_REPLACE=true
+W9_URL='internet_ip:$W9_HTTP_PORT_SET'
 
 W9_NETWORK=websoft9
 
 #### ----------------------------------------------------------------------------------------- ####
 
-
 # Below environment is created by apphub
-
-#W9_NAME=""
-#W9_RCODE=""

apps/wikijs/Dockerfile

@@ -1,2 +1,11 @@
-# Appname
-## FAQ
+# Wiki.js
+1. During the initial startup, configuration is accomplished via IP/domain name, including the setup of username, password, and website domain name. The domain name does not need to be configured, as it does not impact the domain configuration and accessibility of Websoft9 itself.
+
+2. During the initial initialization process of the application, there may be errors popping up. Please check the container log as follows:
+```
+2025-01-18T06:25:57.261Z [MASTER] error: Fetching latest updates from Graph endpoint: [ FAILED ]
+2025-01-18T06:25:57.261Z [MASTER] error: fetch failed
+2025-01-18T06:25:57.459Z [MASTER] error: Syncing locales with Graph endpoint: [ FAILED ]
+2025-01-18T06:25:57.460Z [MASTER] error: fetch failed
+```
+The reason is that the application itself needs to pull data from multiple languages online, and if the pull fails, it can be rebuilt and tried multiple times

apps/wikijs/Notes.md

@@ -1,50 +1,37 @@
-# image,docs: https://hub.docker.com/_/wordpress/
-
 services:
 
-  wordpress:
-    image: $W9_REPO:$W9_VERSION
-    container_name: $W9_ID
+  db:
+    image: postgres:15-alpine
+    container_name: $W9_ID-postgresql
+    environment:
+      POSTGRES_DB: wiki
+      POSTGRES_PASSWORD: $W9_POWER_PASSWORD
+      POSTGRES_USER: postgres
     restart: unless-stopped
-    #This is for access host from container
-    # extra_hosts: ["host.docker.internal:host-gateway"]
-    # command: |
-    #   /bin/bash -c "ping -c 3 host.docker.internal"
-    logging:
-      driver: "json-file"
-      options:
-          max-file: "5"
-          max-size: 10m
-    deploy:
-      resources:
-        limits:
-          memory: 5g
-          cpus: '0.7'
-    ports:
-      - $W9_HTTP_PORT_SET:80
-    env_file: .env
     volumes:
-      - wordpress:/var/www/html
-      - ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
+      - db-data:/var/lib/postgresql/data
 
-  mariadb:
-    image: mariadb:10.4
-    container_name: $W9_ID-mariadb
-    restart: unless-stopped
-    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb_log_buffer_size=30M
-    volumes:
-      - mysql_data:/var/lib/mysql
+  wiki:
+    image: $W9_REPO:$W9_VERSION
+    container_name: $W9_ID
+    depends_on:
+      - db
     environment:
-      MYSQL_DATABASE: $W9_ID
-      MYSQL_USER: $W9_ID
-      MYSQL_PASSWORD: $W9_POWER_PASSWORD
-      MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
+      DB_TYPE: postgres
+      DB_HOST: $W9_ID-postgresql
+      DB_PORT: 5432
+      DB_USER: postgres
+      DB_PASS: $W9_POWER_PASSWORD
+      DB_NAME: wiki
+    restart: unless-stopped
+    env_file: .env
+    ports:
+      - $W9_HTTP_PORT_SET:3000
 
 volumes:
-  wordpress:
-  mysql_data:
-    
+  db-data:
+
 networks:
   default:
     name: $W9_NETWORK
-    external: true
+    external: true