diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-07-02 19:38:49 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-07-02 19:38:49 +0300 |
| commit | 1f7db171d94af97187ac22ae07f3cad2b11d7ae1 (patch) | |
| tree | c3eb684c117a63690f940b12d7abf58910f5da2d | |
| parent | bf06c715fe41b1689f451c1ae1112a06b377768f (diff) | |
| download | wekan-1f7db171d94af97187ac22ae07f3cad2b11d7ae1.tar.gz wekan-1f7db171d94af97187ac22ae07f3cad2b11d7ae1.tar.bz2 wekan-1f7db171d94af97187ac22ae07f3cad2b11d7ae1.zip | |
Try to fix Dockerfile.
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rwxr-xr-x | download-sandstorm-node.sh | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -87,7 +87,9 @@ RUN \ #tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ #rm node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ #mv node-${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs && \ - mv node /opt/nodejs && \ + mkdir -p /opt/nodejs/bin && + mv node /opt/nodejs/bin/ && \ + mv npm /opt/nodejs/bin/ && \ 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 index 2e611f05..ec2b9394 100755 --- a/download-sandstorm-node.sh +++ b/download-sandstorm-node.sh @@ -27,6 +27,7 @@ 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 ===" @@ -60,7 +61,7 @@ fi echo "=== EXTRACTING NODE FROM SANDSTORM RELEASE TARBALL ===" # --strip 2 removes path of 2 subdirectories -tar -xf $TARBALL $NODE_EXE --strip=2 +tar -xf $TARBALL $NODE_EXE $NPM_EXE --strip=2 echo "=== REMOVING SANDSTORM RELEASE TARBALL AND SIGNATURE ===" rm $TARBALL $TARBALL.sig release-certificate.kentonv.si* |