diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6caa815dba6c984cc36720866cf863bdd11e1512..bcbcfcda9df7fa823ecd1454990bb8d6ff28ff79 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 d90237523e15a1c542c9754ae520ed6f48386f0b..1dab16688e35c165abcf398f758ab47f4037bad6 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