Skip to content

Commit aaefb00

Browse files
build(deps): update rust crate mdbook to 0.5.0 (#184)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 parent 2d7290d commit aaefb00

File tree

9 files changed

+1139
-1272
lines changed

9 files changed

+1139
-1272
lines changed

Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ ARG MDBOOK_VERSION
88
ARG CARGO_TARGET
99
ARG MDBOOK_MERMAID_VERSION
1010
ARG MDBOOK_TOC_VERSION
11-
ARG MDBOOK_ADMONISH_VERSION
1211

1312
ENV CARGO_TARGET_DIR="/usr/local/cargo-target"
1413

@@ -30,17 +29,13 @@ RUN --mount=type=cache,sharing=locked,target=/usr/local/cargo-target \
3029
RUN --mount=type=cache,sharing=locked,target=/usr/local/cargo-target \
3130
cargo install mdbook-toc --version "${MDBOOK_TOC_VERSION}" --target "${CARGO_TARGET}" && \
3231
strip "$(which mdbook-toc)"
33-
RUN --mount=type=cache,sharing=locked,target=/usr/local/cargo-target \
34-
cargo install mdbook-admonish --version "${MDBOOK_ADMONISH_VERSION}" --target "${CARGO_TARGET}" && \
35-
strip "$(which mdbook-admonish)"
3632

3733
FROM ${BASE_IMAGE}
3834

3935
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
4036
COPY --from=builder /usr/local/cargo/bin/mdbook /usr/bin/mdbook
4137
COPY --from=builder /usr/local/cargo/bin/mdbook-mermaid /usr/bin/mdbook-mermaid
4238
COPY --from=builder /usr/local/cargo/bin/mdbook-toc /usr/bin/mdbook-toc
43-
COPY --from=builder /usr/local/cargo/bin/mdbook-admonish /usr/bin/mdbook-admonish
4439

4540
WORKDIR /book
4641
ENTRYPOINT [ "/usr/bin/mdbook" ]

Makefile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ DOCKER_BASE_NAME := ghcr.io/${DOCKER_HUB_BASE_NAME}
88
DOCKER_VERSION := $(shell cat ./deps/Cargo.toml | grep 'mdbook = ' | awk '{print $$3}' | tr -d '"')
99
MDBOOK_MERMAID_VERSION := $(shell cat ./deps/Cargo.toml | grep 'mdbook-mermaid = ' | awk '{print $$3}' | tr -d '"')
1010
MDBOOK_TOC_VERSION := $(shell cat ./deps/Cargo.toml | grep 'mdbook-toc = ' | awk '{print $$3}' | tr -d '"')
11-
MDBOOK_ADMONISH_VERSION := $(shell cat ./deps/Cargo.toml | grep 'mdbook-admonish = ' | awk '{print $$3}' | tr -d '"')
1211
DOCKER_TAG := v${DOCKER_VERSION}
1312
GITHUB_REF_NAME ?= local
1413
DOCKER_SCOPE := mdbook-${GITHUB_REF_NAME}
@@ -64,7 +63,6 @@ build-alpine:
6463
--build-arg BASE_IMAGE="alpine:3.20.0" \
6564
--build-arg MDBOOK_MERMAID_VERSION="${MDBOOK_MERMAID_VERSION}" \
6665
--build-arg MDBOOK_TOC_VERSION="${MDBOOK_TOC_VERSION}" \
67-
--build-arg MDBOOK_ADMONISH_VERSION="${MDBOOK_ADMONISH_VERSION}" \
6866
--build-arg CARGO_TARGET="${CARGO_TARGET}"
6967

7068
.PHONY: build-rust
@@ -78,7 +76,6 @@ build-rust:
7876
--build-arg BASE_IMAGE="rust:1.78.0-alpine3.20" \
7977
--build-arg MDBOOK_MERMAID_VERSION="${MDBOOK_MERMAID_VERSION}" \
8078
--build-arg MDBOOK_TOC_VERSION="${MDBOOK_TOC_VERSION}" \
81-
--build-arg MDBOOK_ADMONISH_VERSION="${MDBOOK_ADMONISH_VERSION}" \
8279
--build-arg CARGO_TARGET="${CARGO_TARGET}"
8380

8481
.PHONY: merge
@@ -100,12 +97,10 @@ test:
10097
.PHONY: test-build
10198
test-build:
10299
docker run --rm -v "./example:/book" "${HUB_NAME}-$(PLATFORM)" build
103-
docker run --rm -v "./example:/book" --entrypoint sh "${HUB_NAME}-$(PLATFORM)" -c 'mdbook-admonish install /book'
104100

105101
.PHONY: test-build-with-latest
106102
test-build-with-latest:
107103
docker run --rm -v "./example:/book" "${HUB_LATEST}" build
108-
docker run --rm -v "./example:/book" --entrypoint sh "${HUB_LATEST}" -c 'mdbook-admonish install /book'
109104

110105
.PHONY: run
111106
run:
@@ -114,8 +109,7 @@ run:
114109
.PHONY: compose-build
115110
compose-build:
116111
cd ./example && \
117-
docker compose run --rm mdbook build && \
118-
docker compose run --rm --entrypoint sh mdbook -c 'mdbook-admonish install /book'
112+
docker compose run --rm mdbook build
119113

120114
.PHONY: compose-serve
121115
compose-serve:

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@ CPU architectures amd64 and arm64 are supported.
2929

3030
- [mdbook-mermaid]
3131
- [mdbook-toc]
32-
- [mdbook-admonish]
3332

3433
[mdbook-mermaid]: https://github.com/badboy/mdbook-mermaid
3534
[mdbook-toc]: https://github.com/badboy/mdbook-toc
36-
[mdbook-admonish]: https://github.com/tommilligan/mdbook-admonish
3735

3836

3937

0 commit comments

Comments
 (0)