summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-07-02 19:59:00 +0300
committerLauri Ojansivu <x@xet7.org>2018-07-02 19:59:00 +0300
commitabf7890941e7139e77aadb9c75ba4c314a9a6a1a (patch)
treea7bd1b38d3ccedee9f0f462c640c77c15a244824
parente139e140f4b4a6b3415d2592466d656504f1ade7 (diff)
downloadwekan-abf7890941e7139e77aadb9c75ba4c314a9a6a1a.tar.gz
wekan-abf7890941e7139e77aadb9c75ba4c314a9a6a1a.tar.bz2
wekan-abf7890941e7139e77aadb9c75ba4c314a9a6a1a.zip
Try to fix Dockerfile.
-rw-r--r--Dockerfile1
-rwxr-xr-xdownload-sandstorm-node.sh3
2 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index d21854d5..906638dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,6 +47,7 @@ RUN \
# 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 && \
diff --git a/download-sandstorm-node.sh b/download-sandstorm-node.sh
index ec2b9394..2e611f05 100755
--- a/download-sandstorm-node.sh
+++ b/download-sandstorm-node.sh
@@ -27,7 +27,6 @@ SIGNING_KEY_ID=160D2D577518B58D94C9800B63F227499DA8CCBD
TARBALL=sandstorm-$SANDSTORM_LAST_BUILD.tar.xz
NODE_EXE=sandstorm-$SANDSTORM_LAST_BUILD/bin/node
-NPM_EXE=sandstorm-$SANDSTORM_LAST_BUILD/bin/npm
echo "=== DOWNLOADING SANDSTORM GPG KEYS TO VERIFY SANDSTORM RELEASE ==="
@@ -61,7 +60,7 @@ fi
echo "=== EXTRACTING NODE FROM SANDSTORM RELEASE TARBALL ==="
# --strip 2 removes path of 2 subdirectories
-tar -xf $TARBALL $NODE_EXE $NPM_EXE --strip=2
+tar -xf $TARBALL $NODE_EXE --strip=2
echo "=== REMOVING SANDSTORM RELEASE TARBALL AND SIGNATURE ==="
rm $TARBALL $TARBALL.sig release-certificate.kentonv.si*