Skip to content

Commit 2017cd2

Browse files
committed
Build the image from our fork of mdBook repository
to address CVE-2020-26297 in an old version of mdBook
1 parent 89032b7 commit 2017cd2

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2018
3+
Copyright (c) 2018 - 2021
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

docker/Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
FROM rust:1.47.0
1+
FROM rust:1.49.0-slim
22

3-
ENV MDBOOK_VERSION=0.1.8
3+
ARG MDBOOK_GIT_REPO="https://github.com/rust-lang-ja/mdBook"
4+
5+
# mdbook-0.1 branch of the above repository has a cherry-picked commit to address CVE-2020-26297:
6+
# https://github.com/rust-lang-ja/mdBook/commit/3bb522d8f10e890f9dd6f0250776584810a78cfe
7+
ARG MDBOOK_GIT_BRANCH="mdbook-0.1"
48

59
# Install CircleCI requirements
610
RUN set -eux; \
@@ -10,7 +14,7 @@ RUN set -eux; \
1014

1115
# Install mdBook and sd
1216
RUN set -eux; \
13-
cargo install --force mdbook --vers "^$MDBOOK_VERSION"; \
17+
cargo install --force mdbook --git ${MDBOOK_GIT_REPO} --branch ${MDBOOK_GIT_BRANCH}; \
1418
cargo install --force sd; \
1519
rustc --version; \
1620
mdbook --version; \

0 commit comments

Comments
 (0)