diff options
author | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-07-25 16:27:34 -0400 |
---|---|---|
committer | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-07-25 16:27:34 -0400 |
commit | 2c042e7f119ac404a1060d10d368d1bbd9d15e9c (patch) | |
tree | 4f6fb032e42829fec8076ad90561bdf51d3e04e7 /Dockerfile | |
parent | 8f899fca7286b076db7551fbbfd4434cf4b561e8 (diff) | |
parent | 5f56ba4fb9f024f86f157e3116f5dc3eca79a32f (diff) | |
download | wekan-2c042e7f119ac404a1060d10d368d1bbd9d15e9c.tar.gz wekan-2c042e7f119ac404a1060d10d368d1bbd9d15e9c.tar.bz2 wekan-2c042e7f119ac404a1060d10d368d1bbd9d15e9c.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'Dockerfile')
-rw-r--r-- | Dockerfile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -174,7 +174,7 @@ RUN \ 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 && \ - #mkdir -p /opt/nodejs/lib/node_modules/fibers/.node-gyp /root/.node-gyp/8.16.0 /home/wekan/.config && \ + mkdir -p /opt/nodejs/lib/node_modules/fibers/.node-gyp /root/.node-gyp/8.16.0 /home/wekan/.config && \ chown wekan --recursive /home/wekan/.config && \ \ #DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 @@ -196,8 +196,8 @@ RUN \ #sed -i 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' ./install_meteor.sh && \ echo "Starting meteor ${METEOR_RELEASE} installation... \n" && \ gosu wekan:wekan curl https://install.meteor.com/ | /bin/sh && \ - #chown wekan /home/wekan/install_meteor.sh && \ - #gosu wekan:wekan sh /home/wekan/install_meteor.sh; \ + mv /root/.meteor /home/wekan/ && \ + chown wekan --recursive /home/wekan/.meteor && \ \ # Check if opting for a release candidate instead of major release #if [ "$USE_EDGE" = false ]; then \ @@ -242,7 +242,7 @@ RUN \ # Build app cd /home/wekan/app && \ mkdir -p /home/wekan/.npm && \ - chown wekan --recursive /home/wekan/.npm /home/wekan/.config && \ + chown wekan --recursive /home/wekan/.npm /home/wekan/.config /home/wekan/.meteor && \ #gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \ gosu wekan:wekan npm install && \ gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \ @@ -270,9 +270,9 @@ RUN \ rm -R /var/lib/apt/lists/* && \ rm -R /home/wekan/.meteor && \ rm -R /home/wekan/app && \ - rm -R /home/wekan/app_build && \ + rm -R /home/wekan/app_build #cat /home/wekan/python/esprima-python/files.txt | xargs rm -R && \ - rm -R /home/wekan/python + #rm -R /home/wekan/python #rm /home/wekan/install_meteor.sh ENV PORT=8080 |