summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-03-25 18:57:35 +0200
committerLauri Ojansivu <x@xet7.org>2019-03-25 18:57:35 +0200
commit625682a4dab43c525494af10121edbfd547786d7 (patch)
tree10d10e36b1083a75a8cf98eb3c3477bdc087ee99
parenteec8f45de510cf92dfc37615420d3302630f5a20 (diff)
downloadwekan-625682a4dab43c525494af10121edbfd547786d7.tar.gz
wekan-625682a4dab43c525494af10121edbfd547786d7.tar.bz2
wekan-625682a4dab43c525494af10121edbfd547786d7.zip
- Use older api2html@0.3.0 to fix broken snap and docker build,
because newer api2html caused [breaking change](https://github.com/tobilg/api2html/commit/a9a41bca18db3f9ec61395d7262eff071a995783) at api2html/bin/api2html.js:23 has error about "php: "PHP". Thanks to bentiss with Apache I-CLA ! Closes #2286
-rw-r--r--Dockerfile2
-rw-r--r--snapcraft.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 5f89a998..3a81a472 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -302,7 +302,7 @@ RUN \
gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \
\
# extract the OpenAPI specification
- npm install -g api2html && \
+ npm install -g api2html@0.3.0 && \
mkdir -p /home/wekan/python && \
chown wekan:wekan --recursive /home/wekan/python && \
cd /home/wekan/python && \
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 2b4ab48b..e4b765a5 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -113,7 +113,7 @@ parts:
mkdir -p ./public/api
python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml
# we temporary need api2html and mkdirp
- npm install -g api2html
+ npm install -g api2html@0.3.0
npm install -g mkdirp
api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml
npm uninstall -g mkdirp