From 3a95a10683e94d88192d5de9446c5900a6cd7715 Mon Sep 17 00:00:00 2001 From: Tatsuya Kawano Date: Sat, 13 Nov 2021 07:53:18 +0800 Subject: [PATCH 1/5] Remove unused environment variables from the Dockerfile --- docker/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 48deacd..f52f5d1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,6 @@ FROM buildpack-deps:stretch ARG RUST_VERSION=nightly-2021-05-12 -ARG RUST_ARCH=x86_64-unknown-linux-gnu -ARG RUSTUP_VERSION=1.24.1 ARG MDBOOK_VERSION="0.4.8" ENV RUSTUP_HOME=/usr/local/rustup ENV CARGO_HOME=/usr/local/cargo From 9968039bc59e0dc05a53d73b71388b0b6c9867db Mon Sep 17 00:00:00 2001 From: Tatsuya Kawano Date: Sat, 13 Nov 2021 07:55:10 +0800 Subject: [PATCH 2/5] Update Rust to v1.56.1 and mdBook to v0.4.13 --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f52f5d1..88a81fa 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM buildpack-deps:stretch -ARG RUST_VERSION=nightly-2021-05-12 -ARG MDBOOK_VERSION="0.4.8" +ARG RUST_VERSION=1.56.1 +ARG MDBOOK_VERSION=0.4.13 ENV RUSTUP_HOME=/usr/local/rustup ENV CARGO_HOME=/usr/local/cargo ENV PATH=/usr/local/cargo/bin:$PATH From 625a4c9471cfa77b93636b15812ae7724f9cd11c Mon Sep 17 00:00:00 2001 From: Tatsuya Kawano Date: Sat, 13 Nov 2021 08:13:00 +0800 Subject: [PATCH 3/5] Switch to the official Docker image for Rust --- docker/Dockerfile | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 88a81fa..5bc7854 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,31 +1,18 @@ -FROM buildpack-deps:stretch +FROM rust:1.56.1-slim -ARG RUST_VERSION=1.56.1 -ARG MDBOOK_VERSION=0.4.13 -ENV RUSTUP_HOME=/usr/local/rustup -ENV CARGO_HOME=/usr/local/cargo -ENV PATH=/usr/local/cargo/bin:$PATH +ARG MDBOOK_VERSION="0.4.13" +ARG MDBOOK_TRANSCHECK_VERSION="0.2.8" -# Install CircleCI requirements +# Install mdBook +RUN cargo install mdbook --vers ${MDBOOK_VERSION} + +# Install CircleCI Requirements # https://circleci.com/docs/2.0/custom-images/#required-tools-for-primary-containers RUN set -eux; \ apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install -yy git openssh-server tar gzip ca-certificates; \ - DEBIAN_FRONTEND=noninteractive apt-get install -yy curl; \ rm -rf /var/lib/apt/lists/*; -RUN set -eux; \ - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain ${RUST_VERSION}; \ - chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ - rustup --version; \ - rustc --version; \ - cargo --version; - -RUN set -eux; \ - cargo install mdbook --root ${CARGO_HOME} --vers "^${MDBOOK_VERSION}"; \ - mdbook --version; \ - rm -rf $CARGO_HOME/git; - WORKDIR /data VOLUME ["/data"] CMD [ "/bin/bash" ] From 3b36419658bced664839109f2cb4c9b7a0fbb963 Mon Sep 17 00:00:00 2001 From: Tatsuya Kawano Date: Sat, 13 Nov 2021 08:13:16 +0800 Subject: [PATCH 4/5] Add mdbook-transcheck --- docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5bc7854..526c117 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,6 +6,9 @@ ARG MDBOOK_TRANSCHECK_VERSION="0.2.8" # Install mdBook RUN cargo install mdbook --vers ${MDBOOK_VERSION} +# Install mdbook-transcheck +RUN cargo install mdbook-transcheck --vers ${MDBOOK_TRANSCHECK_VERSION} + # Install CircleCI Requirements # https://circleci.com/docs/2.0/custom-images/#required-tools-for-primary-containers RUN set -eux; \ From bb2d60ba98e4cdac78681263e3e950bf2d18161f Mon Sep 17 00:00:00 2001 From: Tatsuya Kawano Date: Sat, 13 Nov 2021 09:01:18 +0800 Subject: [PATCH 5/5] Tweak wording in the README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3707de5..f0805d9 100644 --- a/README.md +++ b/README.md @@ -11,5 +11,5 @@ ## Dockerイメージの内容について覚え書き -- 本来`mdbook`コマンドをビルド・実行するにはstable版の`rustc`で問題ないが、Edition Guide中のサンプルコードをコンパイルするためにnightly版の`rustc`が必要。 +- 本来`mdbook`コマンドをビルド・実行するにはstable版の`rustc`で問題ないが、Edition Guide中のサンプルコードをコンパイルするためにnightly版の`rustc`が必要になることがある。 * バージョンは`Dockerfile`中の`RUST_VERSION`環境変数で指定している。