Skip to content

Commit 8d0f254

Browse files
sfacklersfackler
committed
Update to 1.39.0
1 parent 1d8ef29 commit 8d0f254

File tree

10 files changed

+42
-42
lines changed

10 files changed

+42
-42
lines changed

‎.travis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ services: docker
33

44
env:
55
#VERSIONS
6-
- VERSION=1.38.0 VARIANT=stretch
7-
- VERSION=1.38.0 VARIANT=stretch/slim
8-
- VERSION=1.38.0 VARIANT=buster
9-
- VERSION=1.38.0 VARIANT=buster/slim
10-
- VERSION=1.38.0 VARIANT=alpine3.10
6+
- VERSION=1.39.0 VARIANT=stretch
7+
- VERSION=1.39.0 VARIANT=stretch/slim
8+
- VERSION=1.39.0 VARIANT=buster
9+
- VERSION=1.39.0 VARIANT=buster/slim
10+
- VERSION=1.39.0 VARIANT=alpine3.10
1111
#VERSIONS
1212

1313
install:

‎1.38.0/alpine3.10/Dockerfile‎ renamed to ‎1.39.0/alpine3.10/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ RUN apk add --no-cache \
77
ENV RUSTUP_HOME=/usr/local/rustup \
88
CARGO_HOME=/usr/local/cargo \
99
PATH=/usr/local/cargo/bin:$PATH \
10-
RUST_VERSION=1.38.0
10+
RUST_VERSION=1.39.0
1111

1212
RUN set -eux; \
13-
url="https://static.rust-lang.org/rustup/archive/1.19.0/x86_64-unknown-linux-musl/rustup-init"; \
13+
url="https://static.rust-lang.org/rustup/archive/1.20.2/x86_64-unknown-linux-musl/rustup-init"; \
1414
wget "$url"; \
15-
echo "b535be813cd89000044764806f569a8c1428417d4226f16ee9993867f0c4ea4e *rustup-init" | sha256sum -c -; \
15+
echo "44d689d8cf49165f059cafe10a5ce49708a26b0b0641169bc0e39ad9c54930d5 *rustup-init" | sha256sum -c -; \
1616
chmod +x rustup-init; \
17-
./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION; \
17+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
1818
rm rustup-init; \
1919
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
2020
rustup --version; \

‎1.38.0/buster/Dockerfile‎ renamed to ‎1.39.0/buster/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ FROM buildpack-deps:buster
33
ENV RUSTUP_HOME=/usr/local/rustup \
44
CARGO_HOME=/usr/local/cargo \
55
PATH=/usr/local/cargo/bin:$PATH \
6-
RUST_VERSION=1.38.0
6+
RUST_VERSION=1.39.0
77

88
RUN set -eux; \
99
dpkgArch="$(dpkg --print-architecture)"; \
1010
case "${dpkgArch##*-}" in \
11-
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='36285482ae5c255f2decfab27d32ba19465804cb3ddf5a23e6ff2a7b0f6e0250' ;; \
12-
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='cb20e54566d4b13434dea1776a961cf7f97afcc292cb4b0fec533503dd2434d0' ;; \
13-
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='58e19ae12101103ccc50b04a2579b9238163f87a27da5078cefc900098f257ab' ;; \
14-
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='d3c42fb8b25f87eb049b6177611eea7d4fd51273de4113706f43cccf5610cfc7' ;; \
11+
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='e68f193542c68ce83c449809d2cad262cc2bbb99640eb47c58fc1dc58cc30add' ;; \
12+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='7c1c329a676e50c287d8183b88f30cd6afd0be140826a9fbbc0e3d717fab34d7' ;; \
13+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='d861cc86594776414de001b96964be645c4bfa27024052704f0976dc3aed1b18' ;; \
14+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='89f1f797dca2e5c1d75790c3c6b7be0ee473a7f4eca9663e623a41272a358da0' ;; \
1515
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
1616
esac; \
17-
url="https://static.rust-lang.org/rustup/archive/1.19.0/${rustArch}/rustup-init"; \
17+
url="https://static.rust-lang.org/rustup/archive/1.20.2/${rustArch}/rustup-init"; \
1818
wget "$url"; \
1919
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2020
chmod +x rustup-init; \
21-
./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION; \
21+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
2222
rm rustup-init; \
2323
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
2424
rustup --version; \

‎1.38.0/buster/slim/Dockerfile‎ renamed to ‎1.39.0/buster/slim/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM debian:buster-slim
33
ENV RUSTUP_HOME=/usr/local/rustup \
44
CARGO_HOME=/usr/local/cargo \
55
PATH=/usr/local/cargo/bin:$PATH \
6-
RUST_VERSION=1.38.0
6+
RUST_VERSION=1.39.0
77

88
RUN set -eux; \
99
apt-get update; \
@@ -15,17 +15,17 @@ RUN set -eux; \
1515
; \
1616
dpkgArch="$(dpkg --print-architecture)"; \
1717
case "${dpkgArch##*-}" in \
18-
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='36285482ae5c255f2decfab27d32ba19465804cb3ddf5a23e6ff2a7b0f6e0250' ;; \
19-
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='cb20e54566d4b13434dea1776a961cf7f97afcc292cb4b0fec533503dd2434d0' ;; \
20-
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='58e19ae12101103ccc50b04a2579b9238163f87a27da5078cefc900098f257ab' ;; \
21-
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='d3c42fb8b25f87eb049b6177611eea7d4fd51273de4113706f43cccf5610cfc7' ;; \
18+
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='e68f193542c68ce83c449809d2cad262cc2bbb99640eb47c58fc1dc58cc30add' ;; \
19+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='7c1c329a676e50c287d8183b88f30cd6afd0be140826a9fbbc0e3d717fab34d7' ;; \
20+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='d861cc86594776414de001b96964be645c4bfa27024052704f0976dc3aed1b18' ;; \
21+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='89f1f797dca2e5c1d75790c3c6b7be0ee473a7f4eca9663e623a41272a358da0' ;; \
2222
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
2323
esac; \
24-
url="https://static.rust-lang.org/rustup/archive/1.19.0/${rustArch}/rustup-init"; \
24+
url="https://static.rust-lang.org/rustup/archive/1.20.2/${rustArch}/rustup-init"; \
2525
wget "$url"; \
2626
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2727
chmod +x rustup-init; \
28-
./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION; \
28+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
2929
rm rustup-init; \
3030
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
3131
rustup --version; \

‎1.38.0/stretch/Dockerfile‎ renamed to ‎1.39.0/stretch/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ FROM buildpack-deps:stretch
33
ENV RUSTUP_HOME=/usr/local/rustup \
44
CARGO_HOME=/usr/local/cargo \
55
PATH=/usr/local/cargo/bin:$PATH \
6-
RUST_VERSION=1.38.0
6+
RUST_VERSION=1.39.0
77

88
RUN set -eux; \
99
dpkgArch="$(dpkg --print-architecture)"; \
1010
case "${dpkgArch##*-}" in \
11-
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='36285482ae5c255f2decfab27d32ba19465804cb3ddf5a23e6ff2a7b0f6e0250' ;; \
12-
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='cb20e54566d4b13434dea1776a961cf7f97afcc292cb4b0fec533503dd2434d0' ;; \
13-
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='58e19ae12101103ccc50b04a2579b9238163f87a27da5078cefc900098f257ab' ;; \
14-
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='d3c42fb8b25f87eb049b6177611eea7d4fd51273de4113706f43cccf5610cfc7' ;; \
11+
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='e68f193542c68ce83c449809d2cad262cc2bbb99640eb47c58fc1dc58cc30add' ;; \
12+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='7c1c329a676e50c287d8183b88f30cd6afd0be140826a9fbbc0e3d717fab34d7' ;; \
13+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='d861cc86594776414de001b96964be645c4bfa27024052704f0976dc3aed1b18' ;; \
14+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='89f1f797dca2e5c1d75790c3c6b7be0ee473a7f4eca9663e623a41272a358da0' ;; \
1515
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
1616
esac; \
17-
url="https://static.rust-lang.org/rustup/archive/1.19.0/${rustArch}/rustup-init"; \
17+
url="https://static.rust-lang.org/rustup/archive/1.20.2/${rustArch}/rustup-init"; \
1818
wget "$url"; \
1919
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2020
chmod +x rustup-init; \
21-
./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION; \
21+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
2222
rm rustup-init; \
2323
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
2424
rustup --version; \

‎1.38.0/stretch/slim/Dockerfile‎ renamed to ‎1.39.0/stretch/slim/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM debian:stretch-slim
33
ENV RUSTUP_HOME=/usr/local/rustup \
44
CARGO_HOME=/usr/local/cargo \
55
PATH=/usr/local/cargo/bin:$PATH \
6-
RUST_VERSION=1.38.0
6+
RUST_VERSION=1.39.0
77

88
RUN set -eux; \
99
apt-get update; \
@@ -15,17 +15,17 @@ RUN set -eux; \
1515
; \
1616
dpkgArch="$(dpkg --print-architecture)"; \
1717
case "${dpkgArch##*-}" in \
18-
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='36285482ae5c255f2decfab27d32ba19465804cb3ddf5a23e6ff2a7b0f6e0250' ;; \
19-
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='cb20e54566d4b13434dea1776a961cf7f97afcc292cb4b0fec533503dd2434d0' ;; \
20-
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='58e19ae12101103ccc50b04a2579b9238163f87a27da5078cefc900098f257ab' ;; \
21-
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='d3c42fb8b25f87eb049b6177611eea7d4fd51273de4113706f43cccf5610cfc7' ;; \
18+
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='e68f193542c68ce83c449809d2cad262cc2bbb99640eb47c58fc1dc58cc30add' ;; \
19+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='7c1c329a676e50c287d8183b88f30cd6afd0be140826a9fbbc0e3d717fab34d7' ;; \
20+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='d861cc86594776414de001b96964be645c4bfa27024052704f0976dc3aed1b18' ;; \
21+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='89f1f797dca2e5c1d75790c3c6b7be0ee473a7f4eca9663e623a41272a358da0' ;; \
2222
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
2323
esac; \
24-
url="https://static.rust-lang.org/rustup/archive/1.19.0/${rustArch}/rustup-init"; \
24+
url="https://static.rust-lang.org/rustup/archive/1.20.2/${rustArch}/rustup-init"; \
2525
wget "$url"; \
2626
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2727
chmod +x rustup-init; \
28-
./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION; \
28+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
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 --default-toolchain $RUST_VERSION; \
17+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
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 --default-toolchain $RUST_VERSION; \
14+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
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 --default-toolchain $RUST_VERSION; \
21+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
2222
rm rustup-init; \
2323
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
2424
rustup --version; \

‎x.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import subprocess
77
import sys
88

9-
rust_version = "1.38.0"
10-
rustup_version = "1.19.0"
9+
rust_version = "1.39.0"
10+
rustup_version = "1.20.2"
1111

1212
DebianArch = namedtuple("DebianArch", ["bashbrew", "dpkg", "rust"])
1313

0 commit comments

Comments
 (0)