Browse Source

Removed paxctl alpine fix #1303 , because it did not work anymore.

Thanks to xet7 !

Closes #1594
Lauri Ojansivu 7 years ago
parent
commit
ce65963217
2 changed files with 8 additions and 6 deletions
  1. 5 4
      Dockerfile
  2. 3 2
      snapcraft.yaml

+ 5 - 4
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} && \

+ 3 - 2
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