Revert Dockerfile changes.

2 files changed, 8 insertions, 84 deletions

diff --git a/Dockerfile b/Dockerfile
index ac1fa9fc..8b8b6a09 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,20 +45,13 @@ RUN \
     # Also see beginning of wekan/server/authentication.js
     #   import Fiber from "fibers";
     #   Fiber.poolSize = 1e9;
-    # Getting newest Node from Sandstorm fork of Node
-    # Source: https://github.com/sandstorm-io/node
-    curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
-    wget https://raw.githubusercontent.com/wekan/wekan/devel/download-sandstorm-node.sh && \
-    bash download-sandstorm-node.sh && \
-    rm download-sandstorm-node.sh && \
-    # == OLD ==
     # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm
     # Description at https://releases.wekan.team/node.txt
-    ##wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
-    ##echo "308d0caaef0a1da3e98d1a1615016aad9659b3caf31d0f09ced20cabedb8acbf  node-v8.11.1-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \
-    ##\
+    wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    echo "308d0caaef0a1da3e98d1a1615016aad9659b3caf31d0f09ced20cabedb8acbf  node-v8.11.1-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \
+    \
     # Verify nodejs authenticity
-    ##grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \
+    grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \
     #export GNUPGHOME="$(mktemp -d)" && \
     #\
     # Try other key servers if ha.pool.sks-keyservers.net is unreachable
@@ -82,15 +75,12 @@ RUN \
     # Ignore socket files then delete files then delete directories
     #find "$GNUPGHOME" -type f | xargs rm -f && \
     #find "$GNUPGHOME" -type d | xargs rm -fR && \
-    ##rm -f SHASUMS256.txt.asc && \
+    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 && \
-    mkdir -p /opt/nodejs/bin && \
-    mv node /opt/nodejs/bin/ && \
-    mv npm /opt/nodejs/bin/ && \
+    tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    rm node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    mv node-${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs && \
     ln -s /opt/nodejs/bin/node /usr/bin/node && \
     ln -s /opt/nodejs/bin/npm /usr/bin/npm && \
     \
diff --git a/download-sandstorm-node.sh b/download-sandstorm-node.sh
deleted file mode 100755
index 2e611f05..00000000
--- a/download-sandstorm-node.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-echo "=== GETTING NEWEST NODE FROM SANDSTORM FORK OF NODE ==="
-echo "=== SOURCE: https://github.com/sandstorm-io/node ==="
-
-# From https://github.com/sandstorm-io/sandstorm/blob/master/branch.conf
-SANDSTORM_BRANCH_NUMBER=0
-
-# From https://github.com/sandstorm-io/sandstorm/blob/master/release.sh
-SANDSTORM_CHANNEL=dev
-SANDSTORM_LAST_BUILD=$(curl -fs https://install.sandstorm.io/$SANDSTORM_CHANNEL)
-
-echo "=== LATEST SANDSTORM RELEASE: ${SANDSTORM_LAST_BUILD}==="
-
-if (( SANDSTORM_LAST_BUILD / 1000 > SANDSTORM_BRANCH_NUMBER )); then
-  echo "SANDSTORM BRANCH ERROR: $CHANNEL has already moved past this branch!" >&2
-  echo "  I refuse to replace it with an older branch." >&2
-  exit 1
-fi
-
-BASE_BUILD=$(( BRANCH_NUMBER * 1000 ))
-BUILD=$(( BASE_BUILD > LAST_BUILD ? BASE_BUILD : LAST_BUILD + 1 ))
-BUILD_MINOR="$(( $BUILD % 1000 ))"
-DISPLAY_VERSION="${BRANCH_NUMBER}.${BUILD_MINOR}"
-TAG_NAME="v${DISPLAY_VERSION}"
-SIGNING_KEY_ID=160D2D577518B58D94C9800B63F227499DA8CCBD
-
-TARBALL=sandstorm-$SANDSTORM_LAST_BUILD.tar.xz
-NODE_EXE=sandstorm-$SANDSTORM_LAST_BUILD/bin/node
-
-echo "=== DOWNLOADING SANDSTORM GPG KEYS TO VERIFY SANDSTORM RELEASE ==="
-
-# Do verification in custom GPG workspace
-# https://docs.sandstorm.io/en/latest/install/#option-3-pgp-verified-install
-export GNUPGHOME=$(mktemp -d)
-
-curl https://raw.githubusercontent.com/sandstorm-io/sandstorm/master/keys/release-keyring.gpg | \
-    gpg --import
-
-wget https://raw.githubusercontent.com/sandstorm-io/sandstorm/master/keys/release-certificate.kentonv.sig
-
-gpg --decrypt release-certificate.kentonv.sig
-
-echo "=== DOWNLOADING SANDSTORM RELEASE FROM https://dl.sandstorm.io/${TARBALL} ==="
-wget https://dl.sandstorm.io/$TARBALL
-
-echo "=== DOWNLOADING SIGNATURE FOR SANDSTORM RELEASE FROM https://dl.sandstorm.io/${TARBALL}.sig ==="
-wget https://dl.sandstorm.io/$TARBALL.sig
-
-echo "=== VERIFYING SIGNATURE OF SANDSTORM RELEASE ==="
-gpg --verify $TARBALL.sig $TARBALL
-
-if [ $? -eq 0 ]
-then
-  echo "=== ALL IS WELL. GOOD SIGNATURE IN SANDSTORM. ==="
-else
- echo "=== PROBLEM WITH SANDSTORM SIGNATURE. ==="
- exit 1
-fi
-
-echo "=== EXTRACTING NODE FROM SANDSTORM RELEASE TARBALL ==="
-# --strip 2 removes path of 2 subdirectories
-tar -xf $TARBALL $NODE_EXE --strip=2
-
-echo "=== REMOVING SANDSTORM RELEASE TARBALL AND SIGNATURE ==="
-rm $TARBALL $TARBALL.sig release-certificate.kentonv.si*