From 766b58d91b7a76738ee7c95da2522ef62de866b1 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 27 Jun 2018 11:06:37 +0300 Subject: v1.08 --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 19612429..8b8b6a09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,9 +47,8 @@ RUN \ # 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 "509e79f1bfccc849b65bd3f207a56095dfa608f17502997e844fa9c9d01e6c20 node-v8.11.1-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \ + 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 - && \ -- cgit v1.2.3-1-g7c22 From bbdb6a90b29040aeb6afe8541e3549b043b2610d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 18:40:08 +0300 Subject: Download node from sandstorm in Dockerfile. --- Dockerfile | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 68 insertions(+), 15 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 8b8b6a09..e6bc5382 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,10 +28,10 @@ ENV SRC_PATH ${SRC_PATH:-./} COPY ${SRC_PATH} /home/wekan/app RUN \ - # Add non-root user wekan + echo "=== Add non-root user wekan" && \ useradd --user-group --system --home-dir /home/wekan wekan && \ \ - # OS dependencies + echo "=== OS dependencies" && \ apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \ \ # Download nodejs @@ -45,13 +45,65 @@ RUN \ # Also see beginning of wekan/server/authentication.js # import Fiber from "fibers"; # Fiber.poolSize = 1e9; + 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 "=== Deleting Sandstorm release tarball and signature" && \ + rm $TARBALL $TARBALL.sig release-certificate.kentonv.si* && \ + # == 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 @@ -75,24 +127,25 @@ 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 && \ + #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 && \ ln -s /opt/nodejs/bin/node /usr/bin/node && \ ln -s /opt/nodejs/bin/npm /usr/bin/npm && \ \ #DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 #paxctl -mC `which node` && \ \ - # Install Node dependencies + echo "=== Install Node dependencies" && \ npm install -g npm@${NPM_VERSION} && \ npm install -g node-gyp && \ npm install -g fibers@${FIBERS_VERSION} && \ \ - # Change user to wekan and install meteor + echo "=== Change user to wekan and install meteor" && \ cd /home/wekan/ && \ chown wekan:wekan --recursive /home/wekan && \ curl https://install.meteor.com -o /home/wekan/install_meteor.sh && \ @@ -107,7 +160,7 @@ RUN \ gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} git://github.com/meteor/meteor.git /home/wekan/.meteor; \ fi; \ \ - # Get additional packages + echo "=== Get additional packages" && \ mkdir -p /home/wekan/app/packages && \ chown wekan:wekan --recursive /home/wekan && \ cd /home/wekan/app/packages && \ @@ -117,7 +170,7 @@ RUN \ cd /home/wekan/.meteor && \ gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \ \ - # Build app + echo "=== Build app" && \ cd /home/wekan/app && \ gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \ gosu wekan:wekan /home/wekan/.meteor/meteor npm install && \ @@ -135,7 +188,7 @@ RUN \ #gosu wekan:wekan npm install bcrypt && \ mv /home/wekan/app_build/bundle /build && \ \ - # Cleanup + echo "=== Cleanup" && \ apt-get remove --purge -y ${BUILD_DEPS} && \ apt-get autoremove -y && \ rm -R /var/lib/apt/lists/* && \ -- cgit v1.2.3-1-g7c22 From aea5ed78486b4709163d803f332ed2eed7fcfd3b Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 18:48:49 +0300 Subject: Try to fix Dockerfile. --- Dockerfile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index e6bc5382..e199c7c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,10 +28,10 @@ ENV SRC_PATH ${SRC_PATH:-./} COPY ${SRC_PATH} /home/wekan/app RUN \ - echo "=== Add non-root user wekan" && \ + # Add non-root user wekan useradd --user-group --system --home-dir /home/wekan wekan && \ \ - echo "=== OS dependencies" && \ + # OS dependencies apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \ \ # Download nodejs @@ -45,8 +45,8 @@ RUN \ # Also see beginning of wekan/server/authentication.js # import Fiber from "fibers"; # Fiber.poolSize = 1e9; - echo "=== Getting newest Node from Sandstorm fork of Node" && \ - echo "=== Source: https://github.com/sandstorm-io/node ===" && \ + # Getting newest Node from Sandstorm fork of Node + # Source: https://github.com/sandstorm-io/node \ # From https://github.com/sandstorm-io/sandstorm/blob/master/branch.conf SANDSTORM_BRANCH_NUMBER=0 && \ @@ -55,7 +55,7 @@ RUN \ SANDSTORM_CHANNEL=dev && \ SANDSTORM_LAST_BUILD=$(curl -fs https://install.sandstorm.io/$SANDSTORM_CHANNEL) && \ \ - echo "=== Latest Sandstorm Release: ${SANDSTORM_LAST_BUILD}===" && \ + # Latest Sandstorm Release if (( SANDSTORM_LAST_BUILD / 1000 > SANDSTORM_BRANCH_NUMBER )); && \ then && \ echo "SANDSTORM BRANCH ERROR: $CHANNEL has already moved past this branch!" >&2 && \ @@ -70,18 +70,18 @@ RUN \ 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" && \ + # 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} ===" && \ + # 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 ===" && \ + # 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" && \ + # Verifying signature of Sandstorm release gpg --verify $TARBALL.sig $TARBALL && \ \ if [ $? -eq 0 ] && \ @@ -94,7 +94,7 @@ RUN \ echo "=== Extracting Node from Sandstorm release tarball" && \ # --strip 2 removes path of 2 subdirectories tar -xf $TARBALL $NODE_EXE --strip=2 && \ - echo "=== Deleting Sandstorm release tarball and signature" && \ + # Deleting Sandstorm release tarball and signature rm $TARBALL $TARBALL.sig release-certificate.kentonv.si* && \ # == OLD == # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm @@ -140,12 +140,12 @@ RUN \ #DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 #paxctl -mC `which node` && \ \ - echo "=== Install Node dependencies" && \ + # Install Node dependencies npm install -g npm@${NPM_VERSION} && \ npm install -g node-gyp && \ npm install -g fibers@${FIBERS_VERSION} && \ \ - echo "=== Change user to wekan and install meteor" && \ + # Change user to wekan and install meteor cd /home/wekan/ && \ chown wekan:wekan --recursive /home/wekan && \ curl https://install.meteor.com -o /home/wekan/install_meteor.sh && \ @@ -160,7 +160,7 @@ RUN \ gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} git://github.com/meteor/meteor.git /home/wekan/.meteor; \ fi; \ \ - echo "=== Get additional packages" && \ + # Get additional packages mkdir -p /home/wekan/app/packages && \ chown wekan:wekan --recursive /home/wekan && \ cd /home/wekan/app/packages && \ @@ -170,7 +170,7 @@ RUN \ cd /home/wekan/.meteor && \ gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \ \ - echo "=== Build app" && \ + # Build app cd /home/wekan/app && \ gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \ gosu wekan:wekan /home/wekan/.meteor/meteor npm install && \ @@ -188,7 +188,7 @@ RUN \ #gosu wekan:wekan npm install bcrypt && \ mv /home/wekan/app_build/bundle /build && \ \ - echo "=== Cleanup" && \ + # Cleanup apt-get remove --purge -y ${BUILD_DEPS} && \ apt-get autoremove -y && \ rm -R /var/lib/apt/lists/* && \ -- cgit v1.2.3-1-g7c22 From e03ee1bd2f4217b0ac2be05ed556aeba0480ff83 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 18:51:42 +0300 Subject: Try to fix Dockerfile. --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index e199c7c8..34edeac3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -84,12 +84,12 @@ RUN \ # 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 && \ + 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 -- cgit v1.2.3-1-g7c22 From 44e20023cce82d7f10fba2c97ece53287eb6f3f1 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 19:05:39 +0300 Subject: Try to fix Dockerfile. --- Dockerfile | 52 +++------------------------------------------------- 1 file changed, 3 insertions(+), 49 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 34edeac3..dbeeef5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,55 +47,9 @@ RUN \ # Fiber.poolSize = 1e9; # Getting newest Node from Sandstorm fork of Node # 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) && \ - \ - # Latest Sandstorm Release - 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 && \ - # 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 && \ - # Downloading Sandstorm release from https://dl.sandstorm.io/${TARBALL} - wget https://dl.sandstorm.io/$TARBALL && \ - # Downloading signature for Sandstorm release from https://dl.sandstorm.io/${TARBALL}.sig - wget https://dl.sandstorm.io/$TARBALL.sig && \ - # 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 && \ - # Deleting Sandstorm release tarball and signature - rm $TARBALL $TARBALL.sig release-certificate.kentonv.si* && \ + wget https://github.com/wekan/wekan/blob/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 -- cgit v1.2.3-1-g7c22 From bf06c715fe41b1689f451c1ae1112a06b377768f Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 19:09:57 +0300 Subject: Fix URL. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index dbeeef5b..1f44fced 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ RUN \ # Fiber.poolSize = 1e9; # Getting newest Node from Sandstorm fork of Node # Source: https://github.com/sandstorm-io/node - wget https://github.com/wekan/wekan/blob/devel/download-sandstorm-node.sh && \ + wget https://raw.githubusercontent.com/wekan/wekan/devel/download-sandstorm-node.sh && \ bash download-sandstorm-node.sh && \ rm download-sandstorm-node.sh && \ # == OLD == -- cgit v1.2.3-1-g7c22 From 1f7db171d94af97187ac22ae07f3cad2b11d7ae1 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 19:38:49 +0300 Subject: Try to fix Dockerfile. --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 1f44fced..b52b62ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 && \ \ -- cgit v1.2.3-1-g7c22 From e139e140f4b4a6b3415d2592466d656504f1ade7 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 19:42:04 +0300 Subject: Fix typo. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index b52b62ff..d21854d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -87,7 +87,7 @@ RUN \ #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 && + mkdir -p /opt/nodejs/bin && \ mv node /opt/nodejs/bin/ && \ mv npm /opt/nodejs/bin/ && \ ln -s /opt/nodejs/bin/node /usr/bin/node && \ -- cgit v1.2.3-1-g7c22 From abf7890941e7139e77aadb9c75ba4c314a9a6a1a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 19:59:00 +0300 Subject: Try to fix Dockerfile. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Dockerfile') 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 && \ -- cgit v1.2.3-1-g7c22 From 2ac7660f29bae026350595596207b918286a2c23 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 20:01:13 +0300 Subject: Fix typo. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 906638dc..ac1fa9fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +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 - + 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 && \ -- cgit v1.2.3-1-g7c22 From 05869792ad09edbe9dacc67460b5e98e9642bb2a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 20:06:22 +0300 Subject: Revert Dockerfile changes. --- Dockerfile | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'Dockerfile') 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 && \ \ -- cgit v1.2.3-1-g7c22