Skip to content

Commit 96796cd

Browse files
authoredJan 31, 2022
Merge pull request #3 from caddijp/bumpup-1.58.1-retry
chore: fix dockerfile
2 parents ac626a8 + 4f1e627 commit 96796cd

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed
 

‎Dockerfile

+3-9
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ARG TOOLCHAIN=stable
99
# - https://www.openssl.org/source/
1010
#
1111
# ALSO UPDATE hooks/build!
12-
ARG OPENSSL_VERSION=1.1.1i
12+
ARG OPENSSL_VERSION=1.1.1m
1313

1414
# Versions for other dependencies. Here are the places to check for new
1515
# releases:
@@ -22,9 +22,8 @@ ARG OPENSSL_VERSION=1.1.1i
2222
#
2323
# We're stuck on PostgreSQL 11 until we figure out
2424
# https://github.com/emk/rust-musl-builder/issues.
25-
ARG MDBOOK_VERSION=0.4.6
26-
ARG CARGO_ABOUT_VERSION=0.2.3
27-
ARG CARGO_DENY_VERSION=0.8.5
25+
ARG CARGO_ABOUT_VERSION=0.4.4
26+
ARG CARGO_DENY_VERSION=0.11.1
2827
ARG ZLIB_VERSION=1.2.11
2928
ARG POSTGRESQL_VERSION=11.11
3029

@@ -57,10 +56,6 @@ RUN apt-get update && \
5756
&& \
5857
apt-get clean && rm -rf /var/lib/apt/lists/* && \
5958
useradd rust --user-group --create-home --shell /bin/bash --groups sudo && \
60-
curl -fLO https://github.com/rust-lang-nursery/mdBook/releases/download/v$MDBOOK_VERSION/mdbook-v$MDBOOK_VERSION-x86_64-unknown-linux-gnu.tar.gz && \
61-
tar xf mdbook-v$MDBOOK_VERSION-x86_64-unknown-linux-gnu.tar.gz && \
62-
mv mdbook /usr/local/bin/ && \
63-
rm -f mdbook-v$MDBOOK_VERSION-x86_64-unknown-linux-gnu.tar.gz && \
6459
curl -fLO https://github.com/EmbarkStudios/cargo-about/releases/download/$CARGO_ABOUT_VERSION/cargo-about-$CARGO_ABOUT_VERSION-x86_64-unknown-linux-musl.tar.gz && \
6560
tar xf cargo-about-$CARGO_ABOUT_VERSION-x86_64-unknown-linux-musl.tar.gz && \
6661
mv cargo-about-$CARGO_ABOUT_VERSION-x86_64-unknown-linux-musl/cargo-about /usr/local/bin/ && \
@@ -167,7 +162,6 @@ ENV X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_DIR=/usr/local/musl/ \
167162
# but cargo-deny provides a superset of cargo-audit's features.
168163
RUN env CARGO_HOME=/opt/rust/cargo cargo install -f cargo-audit && \
169164
env CARGO_HOME=/opt/rust/cargo cargo install -f cargo-deb && \
170-
env CARGO_HOME=/opt/rust/cargo cargo install -f mdbook-graphviz && \
171165
rm -rf /opt/rust/cargo/registry/
172166

173167
# Allow sudo without a password.

0 commit comments

Comments
 (0)
Please sign in to comment.