Skip to content

Commit 05e1380

Browse files
sfacklersfackler
authored
Merge pull request #64 from tilosp/default-host
Set default_host_triple in rustup config
2 parents d237d8c + c59cc58 commit 05e1380

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

‎1.45.2/alpine3.11/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN set -eux; \
1414
wget "$url"; \
1515
echo "cee31c6f72b953c6293fd5d40142c7d61aa85db2a5ea81b3519fe1b492148dc9 *rustup-init" | sha256sum -c -; \
1616
chmod +x rustup-init; \
17-
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
17+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host x86_64-unknown-linux-musl; \
1818
rm rustup-init; \
1919
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
2020
rustup --version; \

‎1.45.2/alpine3.12/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN set -eux; \
1414
wget "$url"; \
1515
echo "cee31c6f72b953c6293fd5d40142c7d61aa85db2a5ea81b3519fe1b492148dc9 *rustup-init" | sha256sum -c -; \
1616
chmod +x rustup-init; \
17-
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
17+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host x86_64-unknown-linux-musl; \
1818
rm rustup-init; \
1919
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
2020
rustup --version; \

‎1.45.2/buster/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN set -eux; \
1818
wget "$url"; \
1919
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2020
chmod +x rustup-init; \
21-
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
21+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
2222
rm rustup-init; \
2323
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
2424
rustup --version; \

‎1.45.2/buster/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN set -eux; \
2525
wget "$url"; \
2626
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2727
chmod +x rustup-init; \
28-
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
28+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
2929
rm rustup-init; \
3030
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
3131
rustup --version; \

‎1.45.2/stretch/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN set -eux; \
1818
wget "$url"; \
1919
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2020
chmod +x rustup-init; \
21-
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
21+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
2222
rm rustup-init; \
2323
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
2424
rustup --version; \

‎1.45.2/stretch/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN set -eux; \
2525
wget "$url"; \
2626
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2727
chmod +x rustup-init; \
28-
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
28+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
2929
rm rustup-init; \
3030
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
3131
rustup --version; \

‎Dockerfile-alpine.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN set -eux; \
1414
wget "$url"; \
1515
echo "%%RUSTUP-SHA256%% *rustup-init" | sha256sum -c -; \
1616
chmod +x rustup-init; \
17-
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
17+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host x86_64-unknown-linux-musl; \
1818
rm rustup-init; \
1919
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
2020
rustup --version; \

‎Dockerfile-debian.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN set -eux; \
1111
wget "$url"; \
1212
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
1313
chmod +x rustup-init; \
14-
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
14+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
1515
rm rustup-init; \
1616
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
1717
rustup --version; \

‎Dockerfile-slim.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN set -eux; \
1818
wget "$url"; \
1919
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2020
chmod +x rustup-init; \
21-
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
21+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
2222
rm rustup-init; \
2323
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
2424
rustup --version; \

0 commit comments

Comments
 (0)