From ce21df0ab8ee14631406887d3f163214933a87d5 Mon Sep 17 00:00:00 2001 From: kevin <vimagick@gmail.com> Date: Sun, 16 Jan 2022 11:36:41 +0800 Subject: [PATCH] update nodebb --- nodebb/Dockerfile | 2 +- nodebb/Dockerfile.debian | 6 ++--- nodebb/README.md | 40 ++++++++++++++++--------------- nodebb/arm/Dockerfile | 40 ------------------------------- nodebb/arm/Dockerfile.debian | 42 --------------------------------- nodebb/arm/docker-compose.yml | 20 ---------------- nodebb/arm/docker-entrypoint.sh | 22 ----------------- nodebb/docker-compose.yml | 40 ++++++++++++++++--------------- 8 files changed, 46 insertions(+), 166 deletions(-) delete mode 100644 nodebb/arm/Dockerfile delete mode 100644 nodebb/arm/Dockerfile.debian delete mode 100644 nodebb/arm/docker-compose.yml delete mode 100755 nodebb/arm/docker-entrypoint.sh diff --git a/nodebb/Dockerfile b/nodebb/Dockerfile index 083f437..bea5b03 100644 --- a/nodebb/Dockerfile +++ b/nodebb/Dockerfile @@ -5,7 +5,7 @@ FROM alpine:3 MAINTAINER EasyPi Software Foundation -ENV BB_VER=1.17.0 +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 diff --git a/nodebb/Dockerfile.debian b/nodebb/Dockerfile.debian index 9055d1c..03c9c86 100644 --- a/nodebb/Dockerfile.debian +++ b/nodebb/Dockerfile.debian @@ -2,10 +2,10 @@ # Dockerfile for nodebb # -FROM debian -MAINTAINER kev <noreply@easypi.pro> +FROM debian:bullseye +MAINTAINER EasyPi Software Foundation -ENV BB_VER=1.12.2 +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 diff --git a/nodebb/README.md b/nodebb/README.md index ee6a507..0454b15 100644 --- a/nodebb/README.md +++ b/nodebb/README.md @@ -10,26 +10,28 @@ Read the [docs][2]. ## docker-compose.yml ```yaml -nodebb: - image: vimagick/nodebb - ports: - - "4567:4567" - links: - - redis - volumes: - - ./data:/var/lib/nodebb - - /usr/src/nodebb/build - - /usr/src/nodebb/node_modules - - /usr/src/nodebb/public/uploads - restart: always +version: "3.8" -redis: - image: redis:alpine - ports: - - "127.0.0.1:6379:6379" - volumes: - - ./data:/data - restart: always +services: + + nodebb: + image: vimagick/nodebb + 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 diff --git a/nodebb/arm/Dockerfile b/nodebb/arm/Dockerfile deleted file mode 100644 index 8e83893..0000000 --- a/nodebb/arm/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -# -# Dockerfile for nodebb-arm -# - -FROM arm32v7/alpine:3 -MAINTAINER EasyPi Software Foundation - -ENV BB_VER=1.17.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 - -WORKDIR $BB_SOURCE -VOLUME $BB_CONTENT - -RUN set -ex \ - && apk add -U bash \ - icu \ - imagemagick \ - nodejs \ - nodejs-npm \ - openssl \ - && apk add -t TMP build-base \ - curl \ - git \ - icu-dev \ - openssl-dev \ - python \ - tar \ - && curl -sSL $BB_URL | tar xz --strip 1 \ - && ./nodebb setup \ - && apk del TMP \ - && rm -rf /tmp/npm* \ - /var/cache/apk/* - -COPY docker-entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] - -EXPOSE 4567 -CMD ["./nodebb", "start"] diff --git a/nodebb/arm/Dockerfile.debian b/nodebb/arm/Dockerfile.debian deleted file mode 100644 index b59a32b..0000000 --- a/nodebb/arm/Dockerfile.debian +++ /dev/null @@ -1,42 +0,0 @@ -# -# Dockerfile for nodebb-arm -# - -FROM resin/rpi-raspbian -MAINTAINER EasyPi Software Foundation - -ENV BB_VER=1.17.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 - -WORKDIR $BB_SOURCE -VOLUME $BB_CONTENT - -RUN set -ex \ - && apt-get update \ - && apt-get install -y build-essential \ - curl \ - git \ - imagemagick \ - libssl1.0.0 \ - libssl-dev \ - python \ - && curl -sSL https://deb.nodesource.com/setup_14.x | bash - \ - && apt-get install -y nodejs \ - && curl -sSL $BB_URL | tar xz --strip 1 \ - && npm install --production \ - && npm cache clean \ - && apt-get remove -y build-essential \ - curl \ - git \ - libssl-dev \ - python \ - && rm -rf /tmp/npm* \ - /var/cache/apt/* - -COPY docker-entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] - -EXPOSE 4567 -CMD ["npm", "start"] diff --git a/nodebb/arm/docker-compose.yml b/nodebb/arm/docker-compose.yml deleted file mode 100644 index 5a7359f..0000000 --- a/nodebb/arm/docker-compose.yml +++ /dev/null @@ -1,20 +0,0 @@ -nodebb: - image: easypi/nodebb-arm - ports: - - "4567:4567" - links: - - redis - volumes: - - ./data:/var/lib/nodebb - - /usr/src/nodebb/build - - /usr/src/nodebb/node_modules - - /usr/src/nodebb/public/uploads - restart: always - -redis: - image: easypi/redis-arm - ports: - - "127.0.0.1:6379:6379" - volumes: - - ./data:/data - restart: always diff --git a/nodebb/arm/docker-entrypoint.sh b/nodebb/arm/docker-entrypoint.sh deleted file mode 100755 index cd52095..0000000 --- a/nodebb/arm/docker-entrypoint.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -e - -export NODE_ENV=production -export silent=false -export daemon=false - -if [[ "$*" == ./nodebb*start* ]]; then - if [ ! -e "$BB_CONTENT/config.json" ]; then - if [ -e "$BB_SOURCE/config.json" ]; then - cp "$BB_SOURCE/config.json" "$BB_CONTENT/config.json" - fi - fi - - if [ -e "$BB_CONTENT/config.json" ]; then - ln -sf "$BB_CONTENT/config.json" "$BB_SOURCE/config.json" - fi - - exec "$@" -fi - -exec "$@" diff --git a/nodebb/docker-compose.yml b/nodebb/docker-compose.yml index 84a2304..3d7f955 100644 --- a/nodebb/docker-compose.yml +++ b/nodebb/docker-compose.yml @@ -1,20 +1,22 @@ -nodebb: - image: vimagick/nodebb - ports: - - "4567:4567" - links: - - redis - volumes: - - ./data:/var/lib/nodebb - - /usr/src/nodebb/build - - /usr/src/nodebb/node_modules - - /usr/src/nodebb/public/uploads - restart: always +version: "3.8" -redis: - image: redis:alpine - ports: - - "127.0.0.1:6379:6379" - volumes: - - ./data:/data - restart: always +services: + + nodebb: + image: vimagick/nodebb + 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