diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-07-02 20:06:22 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-07-02 20:06:22 +0300 |
| commit | 05869792ad09edbe9dacc67460b5e98e9642bb2a (patch) | |
| tree | 97250da9b7e65d0a23cebb7ace4498bf0b78b0e6 /Dockerfile | |
| parent | 2ac7660f29bae026350595596207b918286a2c23 (diff) | |
| download | wekan-05869792ad09edbe9dacc67460b5e98e9642bb2a.tar.gz wekan-05869792ad09edbe9dacc67460b5e98e9642bb2a.tar.bz2 wekan-05869792ad09edbe9dacc67460b5e98e9642bb2a.zip | |
Revert Dockerfile changes.
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 26 |
1 files changed, 8 insertions, 18 deletions
@@ -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 && \ \ |