From ce659632174ba25ca9b5e85b053fde02fd9c3928 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 18 Apr 2018 18:19:22 +0300 Subject: Removed paxctl alpine fix #1303 , because it did not work anymore. Thanks to xet7 ! Closes #1594 --- Dockerfile | 9 +++++---- snapcraft.yaml | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d52211f..c794f6dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,9 @@ ARG ARCHITECTURE ARG SRC_PATH # Set the environment variables (defaults where required) -# paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 -ENV BUILD_DEPS="apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7 paxctl" +# DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 +# ENV BUILD_DEPS="paxctl" +ENV BUILD_DEPS="apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" ENV NODE_VERSION ${NODE_VERSION:-v8.11.1} ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1} ENV USE_EDGE ${USE_EDGE:-false} @@ -84,8 +85,8 @@ RUN \ ln -s /opt/nodejs/bin/node /usr/bin/node && \ ln -s /opt/nodejs/bin/npm /usr/bin/npm && \ \ - # paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 - paxctl -mC `which node` && \ + #DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 + #paxctl -mC `which node` && \ \ # Install Node dependencies npm install -g npm@${NPM_VERSION} && \ diff --git a/snapcraft.yaml b/snapcraft.yaml index abcd1cc6..1c904878 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -118,8 +118,9 @@ parts: rm -f node-SHASUMS256.txt.asc chmod +x node mv node `which node` - echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303" - paxctl -mC `which node` + # DOES NOT WORK: paxctl fix. + #echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303" + #paxctl -mC `which node` echo "Installing meteor" curl https://install.meteor.com/ -o install_meteor.sh sed -i "s|RELEASE=.*|RELEASE=\"1.6.0.1\"|g" install_meteor.sh -- cgit v1.2.3-1-g7c22