From 00743d1e7da53ae27787d9970ab2563dc08f86be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Fri, 18 Dec 2020 20:10:00 +0100
Subject: [PATCH] fix
---
.gitlab-ci.yml | 3 +++
test/docker/Dockerfile | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6caa815d..bcbcfcda 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,6 +108,9 @@ pages:
only:
- dev
script:
+ # TODO is this a good location here?
+ - npm install jsdoc
+ - npm install jsdoc-sphinx
- echo "Deploying"
- make doc
- rm -r public || true ; cp -r build/doc/html public
diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile
index d9023752..1dab1668 100644
--- a/test/docker/Dockerfile
+++ b/test/docker/Dockerfile
@@ -17,6 +17,6 @@ RUN pip3 install caosdb
RUN pip3 install pandas xlrd==1.2.0
RUN pip3 install git+https://gitlab.com/caosdb/caosdb-advanced-user-tools.git@dev
# For automatic documentation
-RUN npm install -g jsdoc
-RUN npm install -g jsdoc-sphinx
+#RUN npm install -g jsdoc
+#RUN npm install -g jsdoc-sphinx
RUN pip3 install sphinx-js sphinx-autoapi recommonmark sphinx-rtd-theme
--
GitLab