From 76a713cd98f4ba560829d54cebdc4efbaf12d986 Mon Sep 17 00:00:00 2001 From: kev Date: Sat, 2 Apr 2016 07:50:15 +0800 Subject: [PATCH] upgrade nodebb to 1.0.2 --- nodebb/Dockerfile | 3 +-- nodebb/Dockerfile.debian | 3 +-- nodebb/arm/Dockerfile | 2 +- nodebb/arm/Dockerfile.debian | 3 +-- nodebb/arm/docker-entrypoint.sh | 2 -- nodebb/docker-entrypoint.sh | 2 -- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/nodebb/Dockerfile b/nodebb/Dockerfile index 4e374bb..2f9055c 100644 --- a/nodebb/Dockerfile +++ b/nodebb/Dockerfile @@ -5,7 +5,7 @@ FROM alpine MAINTAINER kev -ENV BB_VER 1.0.0 +ENV BB_VER 1.0.2 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 @@ -28,7 +28,6 @@ RUN set -ex \ tar \ && curl -sSL $BB_URL | tar xz --strip 1 \ && npm install --production \ - && npm install connect-redis \ && npm cache clean \ && apk del TMP \ && rm -rf /tmp/npm* \ diff --git a/nodebb/Dockerfile.debian b/nodebb/Dockerfile.debian index 3b4fd41..189b2cb 100644 --- a/nodebb/Dockerfile.debian +++ b/nodebb/Dockerfile.debian @@ -5,7 +5,7 @@ FROM debian MAINTAINER kev -ENV BB_VER 0.9.3 +ENV BB_VER 1.0.2 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 @@ -25,7 +25,6 @@ RUN set -ex \ && curl -sSL https://deb.nodesource.com/setup_4.x | bash - \ && apt-get install -y nodejs \ && curl -sSL $BB_URL | tar xz --strip 1 \ - && sed -i '/"bufferutil": {/,/},/d; /"utf-8-validate": {/,/},/d' npm-shrinkwrap.json \ && npm install --production \ && npm cache clean \ && apt-get remove -y build-essential \ diff --git a/nodebb/arm/Dockerfile b/nodebb/arm/Dockerfile index 77ad10e..62c9f19 100644 --- a/nodebb/arm/Dockerfile +++ b/nodebb/arm/Dockerfile @@ -5,7 +5,7 @@ FROM vimagick/alpine-arm MAINTAINER kev -ENV BB_VER 1.0.0 +ENV BB_VER 1.0.2 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/arm/Dockerfile.debian b/nodebb/arm/Dockerfile.debian index a487a4e..65d6947 100644 --- a/nodebb/arm/Dockerfile.debian +++ b/nodebb/arm/Dockerfile.debian @@ -5,7 +5,7 @@ FROM resin/rpi-raspbian MAINTAINER kev -ENV BB_VER 0.9.3 +ENV BB_VER 1.0.2 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 @@ -25,7 +25,6 @@ RUN set -ex \ && curl -sSL https://deb.nodesource.com/setup_4.x | bash - \ && apt-get install -y nodejs \ && curl -sSL $BB_URL | tar xz --strip 1 \ - && sed -i '/"bufferutil": {/,/},/d; /"utf-8-validate": {/,/},/d' npm-shrinkwrap.json \ && npm install --production \ && npm cache clean \ && apt-get remove -y build-essential \ diff --git a/nodebb/arm/docker-entrypoint.sh b/nodebb/arm/docker-entrypoint.sh index 28f4d78..98553fd 100755 --- a/nodebb/arm/docker-entrypoint.sh +++ b/nodebb/arm/docker-entrypoint.sh @@ -14,8 +14,6 @@ if [[ "$*" == npm*start* ]]; then if [ -e "$BB_CONTENT/config.json" ]; then ln -sf "$BB_CONTENT/config.json" "$BB_SOURCE/config.json" - [ -d "$BB_SOURCE/node_modules/redis" ] || npm install redis - [ -d "$BB_SOURCE/node_modules/connect-redis" ] || npm install connect-redis fi exec "$@" diff --git a/nodebb/docker-entrypoint.sh b/nodebb/docker-entrypoint.sh index 28f4d78..98553fd 100755 --- a/nodebb/docker-entrypoint.sh +++ b/nodebb/docker-entrypoint.sh @@ -14,8 +14,6 @@ if [[ "$*" == npm*start* ]]; then if [ -e "$BB_CONTENT/config.json" ]; then ln -sf "$BB_CONTENT/config.json" "$BB_SOURCE/config.json" - [ -d "$BB_SOURCE/node_modules/redis" ] || npm install redis - [ -d "$BB_SOURCE/node_modules/connect-redis" ] || npm install connect-redis fi exec "$@"