summaryrefslogtreecommitdiffstats
path: root/Dockerfile
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-05-14 16:56:35 +0300
committerLauri Ojansivu <x@xet7.org>2019-05-14 16:56:35 +0300
commit4903f3a814b4900761fed2414a41fa6c017ce810 (patch)
tree4b8b06347add763ec226a007c1c76342ac63eac3 /Dockerfile
parent663384e62f8738bfd21b83c6219c16d8c41820f6 (diff)
parent0765278195839deae43519c726c13c71667333bd (diff)
downloadwekan-4903f3a814b4900761fed2414a41fa6c017ce810.tar.gz
wekan-4903f3a814b4900761fed2414a41fa6c017ce810.tar.bz2
wekan-4903f3a814b4900761fed2414a41fa6c017ce810.zip
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile
index 616a4823..9a78ade8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -194,7 +194,7 @@ RUN \
\
# Get additional packages
#mkdir -p /home/wekan/app/packages && \
- chown wekan --recursive /home/wekan && \
+ #chown wekan:wekan --recursive /home/wekan && \
# REPOS BELOW ARE INCLUDED TO WEKAN REPO
#cd /home/wekan/app/packages && \
#gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router && \
@@ -212,7 +212,7 @@ RUN \
gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \
\
# extract the OpenAPI specification
- npm install -g api2html@0.3.0 && \
+ npm install -g api2html@0.3.3 && \
mkdir -p /home/wekan/python && \
chown wekan --recursive /home/wekan/python && \
cd /home/wekan/python && \
@@ -220,9 +220,9 @@ RUN \
cd /home/wekan/python/esprima-python && \
python3 setup.py install --record files.txt && \
cd /home/wekan/app &&\
- mkdir -p ./public/api && \
- python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml && \
- /opt/nodejs/bin/api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml; \
+ gosu wekan:wekan mkdir -p ./public/api && \
+ gosu wekan:wekan python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml && \
+ gosu wekan:wekan /opt/nodejs/bin/api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml; \
# Build app
cd /home/wekan/app && \
gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \