From b691be8e706ab7c638c94e67fb3844df393700e8 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Mon, 17 Jan 2022 16:53:36 +0800
Subject: [PATCH] update nodebb

---
 nodebb/Dockerfile         | 21 +++++++++++++--------
 nodebb/README.md          | 35 ++++-------------------------------
 nodebb/docker-compose.yml | 18 ++++++++++++++----
 3 files changed, 31 insertions(+), 43 deletions(-)

diff --git a/nodebb/Dockerfile b/nodebb/Dockerfile
index 6c4f074..8a7f4ac 100644
--- a/nodebb/Dockerfile
+++ b/nodebb/Dockerfile
@@ -7,11 +7,10 @@ MAINTAINER EasyPi Software Foundation
 
 ENV BB_VER=1.19.0
 ENV BB_URL=https://github.com/NodeBB/NodeBB/archive/v$BB_VER.tar.gz
-ENV BB_SOURCE=/usr/src/nodebb
-ENV BB_CONTENT=/var/lib/nodebb
+ENV BB_DIR=/opt/nodebb
+ENV NODE_ENV=production
 
-WORKDIR $BB_SOURCE
-VOLUME $BB_CONTENT
+WORKDIR $BB_DIR
 
 RUN set -ex \
     && apk add -U bash \
@@ -28,13 +27,19 @@ RUN set -ex \
                       python3 \
                       tar \
     && curl -sSL $BB_URL | tar xz --strip 1 \
-    && ./nodebb setup \
+    && curl -sSL https://github.com/NodeBB/NodeBB/raw/v1.19.0/install/package.json > package.json \
+    && npm install \
     && apk del TMP \
     && rm -rf /tmp/npm* \
               /var/cache/apk/*
 
-COPY docker-entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
+VOLUME $BB_DIR/config \
+       $BB_DIR/build \
+       $BB_DIR/public/uploads
+
+ENV silent=false
+ENV daemon=false
 
 EXPOSE 4567
-CMD ["./nodebb", "start"]
+
+CMD ["./nodebb", "--config", "config/config.json", "start"]
diff --git a/nodebb/README.md b/nodebb/README.md
index 70dcf95..e0a2c68 100644
--- a/nodebb/README.md
+++ b/nodebb/README.md
@@ -7,40 +7,13 @@ nodebb
 
 Read the [docs][2].
 
-## docker-compose.yml
-
-```yaml
-version: "3.8"
-
-services:
-
-  nodebb:
-    image: vimagick/nodebb
-    init: true
-    ports:
-      - "4567:4567"
-    volumes:
-      - ./data:/var/lib/nodebb
-      - /usr/src/nodebb/build
-      - /usr/src/nodebb/node_modules
-      - /usr/src/nodebb/public/uploads
-    depends_on:
-      - redis
-    restart: unless-stopped
-
-  redis:
-    image: redis:6-alpine
-    volumes:
-      - ./data:/data
-    restart: unless-stopped
-```
-
 ## up and running
 
 ```bash
+$ docker-compose run --rm --service-ports nodebb bash
+>>> ./nodebb --config config/config.json setup
+>>> exit
 $ docker-compose up -d
-$ vim data/config.json
-$ docker-compose restart nodebb
 $ firefox http://localhost:4567
 ```
 
@@ -50,7 +23,7 @@ $ firefox http://localhost:4567
 
 ```bash
 $ docker-compose pull nodebb
-$ docker-compose exec nodebb sh
+$ docker-compose exec nodebb bash
 >>> ./nodebb upgrade
 >>> exit
 ```
diff --git a/nodebb/docker-compose.yml b/nodebb/docker-compose.yml
index b47bc84..6bf3a65 100644
--- a/nodebb/docker-compose.yml
+++ b/nodebb/docker-compose.yml
@@ -8,10 +8,15 @@ services:
     ports:
       - "4567:4567"
     volumes:
-      - ./data:/var/lib/nodebb
-      - /usr/src/nodebb/build
-      - /usr/src/nodebb/node_modules
-      - /usr/src/nodebb/public/uploads
+      - nodebb_config:/opt/nodebb/config
+      - nodebb_build:/opt/nodebb/build
+      - nodebb_uploads:/opt/nodebb/public/uploads
+      # /opt/nodebb/node_modules
+    environment:
+      - url=http://localhost:4567/
+      - database=redis
+      - redis__host=redis
+      - redis__database=0
     depends_on:
       - redis
     restart: unless-stopped
@@ -21,3 +26,8 @@ services:
     volumes:
       - ./data:/data
     restart: unless-stopped
+
+volumes:
+  nodebb_config:
+  nodebb_build:
+  nodebb_uploads: