Skip to content

Commit

Permalink
Remove fix for minor version
Browse files Browse the repository at this point in the history
  • Loading branch information
hason committed May 28, 2024
1 parent b612e7e commit b9c62d3
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
11 changes: 6 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ FROM minidocks/weasyprint AS weasyprint
FROM $base_image AS latest
LABEL maintainer="Martin Hasoň <[email protected]>"

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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
\
Expand All @@ -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 \
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
10 changes: 5 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b9c62d3

Please sign in to comment.