summaryrefslogtreecommitdiffstats
path: root/Dockerfile
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-07-10 20:02:06 -0400
committerLauri Ojansivu <x@xet7.org>2019-07-10 20:02:06 -0400
commitcad8ed89ccd3a7033e77531b67f92dfaebf90a3d (patch)
tree166635628d3db54b16b0e20517fb7a9c212a1121 /Dockerfile
parentbae81803853566838073853da7997d5129074598 (diff)
downloadwekan-cad8ed89ccd3a7033e77531b67f92dfaebf90a3d.tar.gz
wekan-cad8ed89ccd3a7033e77531b67f92dfaebf90a3d.tar.bz2
wekan-cad8ed89ccd3a7033e77531b67f92dfaebf90a3d.zip
Try to fix Dockerfile.
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile20
1 files changed, 11 insertions, 9 deletions
diff --git a/Dockerfile b/Dockerfile
index e4321016..f7b5f5b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -171,7 +171,8 @@ 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 && \
+ 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
chmod a+w /root/.node-gyp/8.16.0 && \
\
#DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
@@ -186,22 +187,23 @@ RUN \
# Change user to wekan and install meteor
cd /home/wekan/ && \
chown wekan --recursive /home/wekan && \
- #curl "https://install.meteor.com" -o /home/wekan/install_meteor.sh && \
+ curl "https://install.meteor.com" -o /home/wekan/install_meteor.sh && \
#curl "https://install.meteor.com/?release=${METEOR_RELEASE}" -o /home/wekan/install_meteor.sh && \
# OLD: sed -i "s|RELEASE=.*|RELEASE=${METEOR_RELEASE}\"\"|g" ./install_meteor.sh && \
# Install Meteor forcing its progress
#sed -i 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' ./install_meteor.sh && \
echo "Starting meteor ${METEOR_RELEASE} installation... \n" && \
- #chown wekan /home/wekan/install_meteor.sh && \
+ chown wekan /home/wekan/install_meteor.sh && \
+ gosu wekan:wekan sh /home/wekan/install_meteor.sh; \
\
# Check if opting for a release candidate instead of major release
- if [ "$USE_EDGE" = false ]; then \
+ #if [ "$USE_EDGE" = false ]; then \
#gosu wekan:wekan sh /home/wekan/install_meteor.sh; \
- gosu wekan:wekan curl https://install.meteor.com/ | sh; \
- else \
- gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} https://github.com/meteor/meteor.git /home/wekan/.meteor; \
- fi; \
- \
+ # gosu wekan:wekan curl https://install.meteor.com/ | sh; \
+ #else \
+ # gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} https://github.com/meteor/meteor.git /home/wekan/.meteor; \
+ #fi; \
+ #\
# Get additional packages
#mkdir -p /home/wekan/app/packages && \
#chown wekan:wekan --recursive /home/wekan && \