diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-04-18 18:19:22 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-04-18 18:19:22 +0300 |
| commit | ce659632174ba25ca9b5e85b053fde02fd9c3928 (patch) | |
| tree | d91d270f5e4de53eed0d906b4ec43ad0f679eb7a | |
| parent | 1e0fcfd20de69abe0541c3e18af2ff5ef75e5815 (diff) | |
| download | wekan-ce659632174ba25ca9b5e85b053fde02fd9c3928.tar.gz wekan-ce659632174ba25ca9b5e85b053fde02fd9c3928.tar.bz2 wekan-ce659632174ba25ca9b5e85b053fde02fd9c3928.zip | |
Removed paxctl alpine fix #1303 , because it did not work anymore.
Thanks to xet7 !
Closes #1594
| -rw-r--r-- | Dockerfile | 9 | ||||
| -rw-r--r-- | snapcraft.yaml | 5 |
2 files changed, 8 insertions, 6 deletions
@@ -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 |