diff --git a/Dockerfile b/Dockerfile index 9711029..b43530c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,10 +7,8 @@ FROM minidocks/weasyprint AS weasyprint FROM $base_image AS latest LABEL maintainer="Martin Hasoň " -ARG mkdocs_version=1.5.3 - RUN apk add py3-regex py3-pynacl py3-ruamel.yaml && pip install \ - mkdocs==$mkdocs_version \ + mkdocs \ \ mkdocs-abs-rel-plugin \ mkdocs-add-number-plugin \ @@ -19,6 +17,7 @@ RUN apk add py3-regex py3-pynacl py3-ruamel.yaml && pip install \ mkdocs-awesome-pages-plugin \ mkdocs-categories-plugin \ mkdocs-codeinclude-plugin \ + mkdocs-embed-external-markdown \ mkdocs-enumerate-headings-plugin \ mkdocs-exclude \ mkdocs-exclude-search \ @@ -43,6 +42,7 @@ RUN apk add py3-regex py3-pynacl py3-ruamel.yaml && pip install \ mkdocs-nav-weight \ mkdocs-no-sitemap-plugin \ mkdocs-print-site-plugin \ + mkdocs-publisher \ mkdocs_pymdownx_material_extras \ mkdocs-safe-text-plugin \ mkdocs-same-dir \ @@ -51,7 +51,6 @@ RUN apk add py3-regex py3-pynacl py3-ruamel.yaml && pip install \ mkdocs-simple-plugin \ mkdocs-swagger-ui-tag \ mkdocs-redirects \ - mkdocs-versioning \ mkdocs-with-confluence \ mkdocstrings \ \ @@ -60,6 +59,8 @@ RUN apk add py3-regex py3-pynacl py3-ruamel.yaml && pip install \ mkdocs-kpn \ mkdocs-material \ \ + mike \ + \ neoteroi-mkdocs \ \ markdown-customblocks \ @@ -70,7 +71,7 @@ RUN apk add py3-regex py3-pynacl py3-ruamel.yaml && pip install \ COPY rootfs / -CMD [ "mkdocs", "serve", "--dev-addr", "0.0.0.0:8000" ] +CMD [ "mkdocs", "serve", "--cleanr", "--dev-addr", "0.0.0.0:8000" ] FROM minidocks/python:3-build AS build diff --git a/README.md b/README.md index 67b3071..eb31611 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,7 @@ Installed extensions - [Print site](https://timvink.github.io/mkdocs-print-site-plugin/index.html) adds a page to your site combining all pages, allowing your site visitors to `File > Print > Save as PDF` the entire site. +- [Publisher](https://mkusz.github.io/mkdocs-publisher/) - [Pymdownx Material Extras](https://github.com/facelessuser/mkdocs_pymdownx_material_extras) - [Safe text](https://github.com/raimon49/mkdocs-safe-text-plugin) for safe text @@ -95,7 +96,6 @@ Installed extensions - [Swagger UI](https://blueswen.github.io/mkdocs-swagger-ui-tag/) - [Redirects](https://github.com/datarobot/mkdocs-redirects) to create page redirects (e.g. for moved/renamed pages). -- [Versioning](https://github.com/zayd62/mkdocs-versioning) ##### Only in 1-pdf and pdf tags diff --git a/build.sh b/build.sh index 777d35b..a2b8a48 100755 --- a/build.sh +++ b/build.sh @@ -3,15 +3,15 @@ set -e image="${namespace:-minidocks}/mkdocs" versions=" -1;1.5.3 -1-pdf;1.5.3;weasyprint;pdf -pdf;1.5.3;weasyprint;pdf -latest;1.5.3; +1 +1-pdf;weasyprint;pdf +pdf;weasyprint;pdf +latest; " build() { IFS=" " - docker buildx build $docker_opts --target="${4:-latest}" --build-arg base_image="${3:-python}" --build-arg mkdocs_version="$2" -t "$image:$1" "$(dirname $0)" + docker buildx build $docker_opts --target="${3:-latest}" --build-arg base_image="${2:-python}" -t "$image:$1" "$(dirname $0)" } case "$1" in