Skip to content

Commit a96ae96

Browse files
author
Ino Murko
authored
Inomurko/bump rust2 (#58)
* 1.46 rust
1 parent c0e9fa9 commit a96ae96

File tree

2 files changed

+34
-2
lines changed

2 files changed

+34
-2
lines changed

builder/Dockerfile

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,28 @@ RUN set -xe \
6363
ca-certificates \
6464
libressl-dev \
6565
lksctp-tools \
66-
&& apk add --no-cache rust=1.46.0-r0 cargo=1.46.0-r0 \
6766
&& addgroup -g ${GID} ${GROUP} \
6867
&& adduser -D -h ${HOME} -u ${UID} -G ${GROUP} -H ${USER} \
6968
&& mkdir -p "${HOME}" \
7069
&& chown -R "${UID}:${GID}" "${HOME}"
7170

71+
ENV RUSTUP_HOME=/usr/local/rustup \
72+
CARGO_HOME=/usr/local/cargo \
73+
PATH=/usr/local/cargo/bin:$PATH \
74+
RUST_VERSION=1.46.0
75+
76+
RUN set -eux; \
77+
url="https://static.rust-lang.org/rustup/archive/1.22.1/x86_64-unknown-linux-musl/rustup-init"; \
78+
wget "$url"; \
79+
echo "cee31c6f72b953c6293fd5d40142c7d61aa85db2a5ea81b3519fe1b492148dc9 *rustup-init" | sha256sum -c -; \
80+
chmod +x rustup-init; \
81+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host x86_64-unknown-linux-musl; \
82+
rm rustup-init; \
83+
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
84+
rustup --version; \
85+
cargo --version; \
86+
rustc --version;
87+
7288
USER ${USER}
7389

7490
RUN set -xe \

builder_childchain/Dockerfile

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,28 @@ RUN set -xe \
6060
ca-certificates \
6161
libressl-dev \
6262
lksctp-tools \
63-
&& apk add --no-cache rust=1.46.0-r0 cargo=1.46.0-r0 \
6463
&& addgroup -g ${GID} ${GROUP} \
6564
&& adduser -D -h ${HOME} -u ${UID} -G ${GROUP} -H ${USER} \
6665
&& mkdir -p "${HOME}" \
6766
&& chown -R "${UID}:${GID}" "${HOME}"
6867

68+
ENV RUSTUP_HOME=/usr/local/rustup \
69+
CARGO_HOME=/usr/local/cargo \
70+
PATH=/usr/local/cargo/bin:$PATH \
71+
RUST_VERSION=1.46.0
72+
73+
RUN set -eux; \
74+
url="https://static.rust-lang.org/rustup/archive/1.22.1/x86_64-unknown-linux-musl/rustup-init"; \
75+
wget "$url"; \
76+
echo "cee31c6f72b953c6293fd5d40142c7d61aa85db2a5ea81b3519fe1b492148dc9 *rustup-init" | sha256sum -c -; \
77+
chmod +x rustup-init; \
78+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host x86_64-unknown-linux-musl; \
79+
rm rustup-init; \
80+
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
81+
rustup --version; \
82+
cargo --version; \
83+
rustc --version;
84+
6985
USER ${USER}
7086

7187
RUN set -xe \

0 commit comments

Comments
 (0)