From ffd1b93abf8e8898399f91ff9c7f032078d34013 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Tue, 14 May 2019 10:26:50 +0200 Subject: [PATCH 1/3] Dockerfile: bump api2html to version 0.3.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e02455e59..87ee92f7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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:wekan --recursive /home/wekan/python && \ cd /home/wekan/python && \ From 76cd5a28441c83f1174639f4c0ae52ae7a8c01af Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Tue, 14 May 2019 10:30:13 +0200 Subject: [PATCH 2/3] Dockerfile: use gosu for creating the openapi files --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 87ee92f7a..395aae482 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 && \ From 1e34585548d6529dfabf16a3c36dc00d67536c53 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Tue, 14 May 2019 10:29:52 +0200 Subject: [PATCH 3/3] Dockerfile: no need to change the permissions once again we carefully used gosu where needed, so there is no need to re-run a check on the permissions. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 395aae482..bb40bea4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -194,7 +194,7 @@ RUN \ \ # Get additional packages #mkdir -p /home/wekan/app/packages && \ - chown wekan: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 && \