From d6f5a29216a1446db265f204a7806a45892676fc Mon Sep 17 00:00:00 2001 From: dropthemic <20729448+dropthemic@users.noreply.github.com> Date: Fri, 23 Jun 2023 13:23:53 -0700 Subject: [PATCH 1/2] Fixed index.md to point to correct WEBServer page --- docs/docs/api/rest/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/api/rest/index.md b/docs/docs/api/rest/index.md index d5e96c848..865350a8c 100644 --- a/docs/docs/api/rest/index.md +++ b/docs/docs/api/rest/index.md @@ -1,7 +1,7 @@ # NSClient++ API NSClient++ provides its own HTTP API which can -be enabled with the [WEBServer module](../reference/generic/WEBServer.md#WEBServer). +be enabled with the [WEBServer module](../../reference/generic/WEBServer.md#WEBServer). The new API is described in separate pages (on per object): From 7afa3f30110757d0a4f0a0b1fbac1f0f6081cd5c Mon Sep 17 00:00:00 2001 From: dropthemic <20729448+dropthemic@users.noreply.github.com> Date: Fri, 23 Jun 2023 14:20:32 -0700 Subject: [PATCH 2/2] Updated Dockerfile to point to correct debian sources and updated pip packages to use versions supported in python 2.7 --- build/docker/debian-9/Dockerfile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/build/docker/debian-9/Dockerfile b/build/docker/debian-9/Dockerfile index aa3b1ac81..492ebafc5 100644 --- a/build/docker/debian-9/Dockerfile +++ b/build/docker/debian-9/Dockerfile @@ -6,16 +6,27 @@ ADD . /nscp/ ARG DEBIAN_FRONTEND=noninteractive +#Debian moved sources to archive, see https://stackoverflow.com/questions/76094428/debian-stretch-repositories-404-not-found +RUN sed -i -e 's/deb.debian.org/archive.debian.org/g' \ + -e 's|security.debian.org/|archive.debian.org/|g' \ + -e '/stretch-updates/d' /etc/apt/sources.list + RUN apt-get update && apt-get install -y build-essential -RUN apt-get install -y cmake python python-dev libssl-dev libboost-all-dev protobuf-compiler python-protobuf libprotobuf-dev python-sphinx libcrypto++-dev libcrypto++ liblua5.1-0-dev libgtest-dev +RUN apt-get install -y cmake python python-dev libssl-dev libboost-all-dev protobuf-compiler python-protobuf libprotobuf-dev \ +python-sphinx libcrypto++-dev libcrypto++ liblua5.1-0-dev libgtest-dev RUN apt-get install -y git wget dos2unix debhelper dh-virtualenv python-pip zip devscripts ENV GH_TOKEN=UPDATE_ME -RUN chmod u+x /nscp/ext/md-protobuf/protoc-gen-md +#get around Failed loading extension "toc(permalink=true)". +#see https://github.com/mkdocs/mkdocs/issues/1640#issue-364121171 +RUN pip install Markdown==2.6.11 +#mkdocs does not support python 2 after 0.16.x +RUN pip install jinja2 mkdocs==0.16.3 mkdocs-material==1.4.1 -RUN pip install jinja2 mkdocs mkdocs-material github3.py +# pip package wrapt on arm64 fails, lock to older version to get things to install correctly +RUN apt-get install -y libffi-dev && pip install wrapt==1.12.1 cffi && pip install github3.py RUN mkdir -p /build RUN mkdir -p /packages @@ -25,4 +36,3 @@ VOLUME /packages WORKDIR /build CMD /nscp/build/sh/build-debian.sh -