Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

Browse source 
Thanks to xet7 !

Closes #1594
This commit is contained in:
Lauri Ojansivu 2018-04-18 18:19:22 +03:00
parent 1e0fcfd20d
commit ce65963217
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Dockerfile
View file

@ -12,8 +12,9 @@ ARG ARCHITECTURE
ARG SRC_PATH ARG SRC_PATH
# Set the environment variables (defaults where required) # Set the environment variables (defaults where required)
# paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 # DOES NOT WORK: 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" # 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 NODE_VERSION ${NODE_VERSION:-v8.11.1}
ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1} ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1}
ENV USE_EDGE ${USE_EDGE:-false} 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/node /usr/bin/node && \
ln -s /opt/nodejs/bin/npm /usr/bin/npm && \ ln -s /opt/nodejs/bin/npm /usr/bin/npm && \
\ \
# paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 #DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
paxctl -mC `which node` && \ #paxctl -mC `which node` && \
\ \
# Install Node dependencies # Install Node dependencies
npm install -g npm@${NPM_VERSION} && \ npm install -g npm@${NPM_VERSION} && \

5
snapcraft.yaml
View file

@ -118,8 +118,9 @@ parts:
rm -f node-SHASUMS256.txt.asc rm -f node-SHASUMS256.txt.asc
chmod +x node chmod +x node
mv node `which node` mv node `which node`
echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303" # DOES NOT WORK: paxctl fix.
paxctl -mC `which node` #echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303"
#paxctl -mC `which node`
echo "Installing meteor" echo "Installing meteor"
curl https://install.meteor.com/ -o install_meteor.sh curl https://install.meteor.com/ -o install_meteor.sh
sed -i "s|RELEASE=.*|RELEASE=\"1.6.0.1\"|g" install_meteor.sh sed -i "s|RELEASE=.*|RELEASE=\"1.6.0.1\"|g" install_meteor.sh