Try to fix Dockerfile

1 files changed, 34 insertions, 44 deletions

diff --git a/Dockerfile b/Dockerfile
index 72a65638..695efda3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,68 +34,58 @@ RUN \
     apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \
     \
     # Download nodejs
-    wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
-    wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
+    #wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    #wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
+    #---------------------------------------------------------------------------------------------
+    # Node Fibers 100% CPU usage issue:
+    # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161
+    # https://github.com/meteor/meteor/issues/9796#issuecomment-381676326
+    # https://github.com/sandstorm-io/sandstorm/blob/0f1fec013fe7208ed0fd97eb88b31b77e3c61f42/shell/server/00-startup.js#L99-L129
+    # Also see beginning of wekan/server/authentication.js
+    #   import Fiber from "fibers";
+    #   Fiber.poolSize = 1e9;
+    # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm
+    # Description at https://releases.wekan.team/node.txt
+    # SHA256SUM: 18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d
+    wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    echo "5e345fba54360bcdbaa0f8343ddd288b4fe6bbcc6f1a7257576814c39ef6a782  node-v8.11.1-linux-x64.tar.xz" >> SHASUMS256.txt.asc && \
     \
     # Verify nodejs authenticity
     grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \
-    export GNUPGHOME="$(mktemp -d)" && \
-    \
+    #export GNUPGHOME="$(mktemp -d)" && \
+    #\
     # Try other key servers if ha.pool.sks-keyservers.net is unreachable
     # Code from https://github.com/chorrell/docker-node/commit/2b673e17547c34f17f24553db02beefbac98d23c
     # gpg keys listed at https://github.com/nodejs/node#release-team
     # and keys listed here from previous version of this Dockerfile
-    for key in \
-    9554F04D7259F04124DE6B476D5A82AC7E37093B \
-    94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-    FD3A5288F042B6850C66B31F09FE44734EB7990E \
-    71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-    DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-    B9AE9905FFD7803F25714661B63B535A4C206CA9 \
-    ; do \
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
-    gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
-    done && \
-    gpg --verify SHASUMS256.txt.asc && \
+    #for key in \
+    #9554F04D7259F04124DE6B476D5A82AC7E37093B \
+    #94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
+    #FD3A5288F042B6850C66B31F09FE44734EB7990E \
+    #71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
+    #DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
+    #C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+    #B9AE9905FFD7803F25714661B63B535A4C206CA9 \
+    #; do \
+    #gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+    #gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+    #gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    #done && \
+    #gpg --verify SHASUMS256.txt.asc && \
     # Ignore socket files then delete files then delete directories
-    find "$GNUPGHOME" -type f | xargs rm -f && \
-    find "$GNUPGHOME" -type d | xargs rm -fR && \
+    #find "$GNUPGHOME" -type f | xargs rm -f && \
+    #find "$GNUPGHOME" -type d | xargs rm -fR && \
     rm -f SHASUMS256.txt.asc && \
     \
     # Install Node
     tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
     rm node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
     mv node-${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs && \
-    \
-    # Remove original node, use Fibers 100% CPU usage issue patched node
-    rm /opt/nodejs/bin/node && \
-    # Node Fibers 100% CPU usage issue:
-    # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161
-    # https://github.com/meteor/meteor/issues/9796#issuecomment-381676326
-    # https://github.com/sandstorm-io/sandstorm/blob/0f1fec013fe7208ed0fd97eb88b31b77e3c61f42/shell/server/00-startup.js#L99-L129
-    # Also see beginning of wekan/server/authentication.js
-    #   import Fiber from "fibers";
-    #   Fiber.poolSize = 1e9;
-    # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm
-    # Description at https://releases.wekan.team/node.txt
-    # SHA256SUM: 18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d
-    echo "18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d  node" >> node-SHASUMS256.txt.asc && \
-    wget https://releases.wekan.team/node && \
-    # Verify Fibers patched node authenticity
-    echo "Fibers patched node authenticity:" && \
-    grep node node-SHASUMS256.txt.asc | shasum -a 256 -c - && \
-    rm -f node-SHASUMS256.txt.asc && \
-    chmod +x node && \
-    mv node /opt/nodejs/bin/node && \
-    \
-    # Create symlinks
     ln -s /opt/nodejs/bin/node /usr/bin/node && \
     ln -s /opt/nodejs/bin/npm /usr/bin/npm && \
     \
     # paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
-    paxctl -mC /opt/nodejs/bin/node && \
+    paxctl -mC `which node` && \
     \
     # Install Node dependencies
     npm install -g npm@${NPM_VERSION} && \