Skip to content

Commit

Permalink
Merge pull request #1252 from Websoft9/update-nodebb-7ea21e97
Browse files Browse the repository at this point in the history
Update nodebb
  • Loading branch information
qiaofeng1227 authored Jan 14, 2025
2 parents f5071c0 + 1331660 commit 175c187
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 193 deletions.
37 changes: 9 additions & 28 deletions apps/nodebb/.env
Original file line number Diff line number Diff line change
@@ -1,47 +1,28 @@
W9_REPO=wordpress
W9_DIST=community
W9_VERSION=latest

W9_POWER_PASSWORD=1PrMxExC45LsCT
W9_REPO=ghcr.io/nodebb/nodebb
W9_DIST='community'
W9_VERSION='3.12'
W9_POWER_PASSWORD='nXBKnkkSHKa2!IeK'

# 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=nodenbb
W9_ID='nodenbb'

# 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=4567

# 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=""
21 changes: 0 additions & 21 deletions apps/nodebb/Dockerfile

This file was deleted.

18 changes: 16 additions & 2 deletions apps/nodebb/Notes.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,16 @@
# Appname
## FAQ
# NodeBB
1.After the application is installed, the main container background will execute the command: npm install, and there are no logs.

Due to network issues in China, the download process is extremely slow, resulting in very slow application initialization.

2.You need to wait until the main container generates logs, and after seeing logs similar to the following:

```Web installer listening on http://0.0.0.0:4567```

it indicates that the npm install process is complete, and the installation of NodeBB is ready to begin.

3.NodeBB supports MongoDB, PostgreSQL, and Redis. Websoft9 is configured to use PostgreSQL exclusively.

During the initial web setup, select PostgreSQL for the database connection.

The database name, username, and password are specified in the .env file of the corresponding Gitea repository.
26 changes: 0 additions & 26 deletions apps/nodebb/README.jinja2

This file was deleted.

52 changes: 20 additions & 32 deletions apps/nodebb/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,50 +1,38 @@
# image,docs: https://hub.docker.com/_/wordpress/
version: '3.8'

services:

wordpress:
nodebb:
image: $W9_REPO:$W9_VERSION
container_name: $W9_ID
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
- $W9_HTTP_PORT_SET:4567
env_file: .env
volumes:
- wordpress:/var/www/html
- ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
- nodebb-build:/usr/src/app/build
- nodebb-uploads:/usr/src/app/public/uploads
- nodebb-config:/opt/config

mariadb:
image: mariadb:10.4
container_name: $W9_ID-mariadb
postgres:
image: postgres:17.2-alpine
container_name: $W9_ID-postgres
restart: unless-stopped
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb_log_buffer_size=30M
volumes:
- mysql_data:/var/lib/mysql
environment:
MYSQL_DATABASE: $W9_ID
MYSQL_USER: $W9_ID
MYSQL_PASSWORD: $W9_POWER_PASSWORD
MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
POSTGRES_USER: $W9_ID
POSTGRES_PASSWORD: $W9_POWER_PASSWORD
POSTGRES_DB: $W9_ID
volumes:
- postgres-data:/var/lib/postgresql/data


volumes:
wordpress:
mysql_data:
nodebb-build:
nodebb-uploads:
nodebb-config:
postgres-data:

networks:
default:
name: $W9_NETWORK
external: true
external: true
1 change: 0 additions & 1 deletion apps/nodebb/src/after_up.sh

This file was deleted.

12 changes: 0 additions & 12 deletions apps/nodebb/src/encrypt.sh

This file was deleted.

3 changes: 0 additions & 3 deletions apps/nodebb/src/filelist

This file was deleted.

1 change: 0 additions & 1 deletion apps/nodebb/src/get_version.sh

This file was deleted.

57 changes: 0 additions & 57 deletions apps/nodebb/src/nginx-proxy.conf.template

This file was deleted.

8 changes: 0 additions & 8 deletions apps/nodebb/src/php_exra.ini

This file was deleted.

1 change: 0 additions & 1 deletion apps/nodebb/src/replace_url.sh

This file was deleted.

3 changes: 2 additions & 1 deletion apps/nodebb/variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
"trademark": "NodeBB",
"release": false,
"fork_url": "https://github.com/NodeBB/NodeBB",
"version_from": "",
"version_from": "https://github.com/NodeBB/NodeBB/releases",
"edition": [
{
"dist": "community",
"version": [
"3.12",
"latest"
]
}
Expand Down

0 comments on commit 175c187

Please sign in to comment.