update nodebb

This commit is contained in:
kevin 2022-01-16 11:36:41 +08:00
parent 5f5f6b2150
commit ce21df0ab8
8 changed files with 46 additions and 166 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"]

View File

@ -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"]

View File

@ -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

View File

@ -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 "$@"

View File

@ -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