Skip to content

Commit 76921dd

Browse files
sfacklersfackler
committed
1.41.0
1 parent feb3947 commit 76921dd

File tree

8 files changed

+39
-40
lines changed

8 files changed

+39
-40
lines changed

‎.travis.yml‎

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

44
env:
55
#VERSIONS
6-
- VERSION=1.40.0 VARIANT=stretch
7-
- VERSION=1.40.0 VARIANT=stretch/slim
8-
- VERSION=1.40.0 VARIANT=buster
9-
- VERSION=1.40.0 VARIANT=buster/slim
10-
- VERSION=1.40.0 VARIANT=alpine3.10
11-
- VERSION=1.40.0 VARIANT=alpine3.11
6+
- VERSION=1.41.0 VARIANT=stretch
7+
- VERSION=1.41.0 VARIANT=stretch/slim
8+
- VERSION=1.41.0 VARIANT=buster
9+
- VERSION=1.41.0 VARIANT=buster/slim
10+
- VERSION=1.41.0 VARIANT=alpine3.10
11+
- VERSION=1.41.0 VARIANT=alpine3.11
1212
#VERSIONS
1313

1414
install:

‎1.40.0/alpine3.10/Dockerfile‎ renamed to ‎1.41.0/alpine3.10/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ 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.40.0
10+
RUST_VERSION=1.41.0
1111

1212
RUN set -eux; \
13-
url="https://static.rust-lang.org/rustup/archive/1.20.2/x86_64-unknown-linux-musl/rustup-init"; \
13+
url="https://static.rust-lang.org/rustup/archive/1.21.1/x86_64-unknown-linux-musl/rustup-init"; \
1414
wget "$url"; \
15-
echo "44d689d8cf49165f059cafe10a5ce49708a26b0b0641169bc0e39ad9c54930d5 *rustup-init" | sha256sum -c -; \
15+
echo "0c86d467982bdf5c4b8d844bf8c3f7fc602cc4ac30b29262b8941d6d8b363d7e *rustup-init" | sha256sum -c -; \
1616
chmod +x rustup-init; \
1717
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
1818
rm rustup-init; \

‎1.40.0/alpine3.11/Dockerfile‎ renamed to ‎1.41.0/alpine3.11/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ 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.40.0
10+
RUST_VERSION=1.41.0
1111

1212
RUN set -eux; \
13-
url="https://static.rust-lang.org/rustup/archive/1.20.2/x86_64-unknown-linux-musl/rustup-init"; \
13+
url="https://static.rust-lang.org/rustup/archive/1.21.1/x86_64-unknown-linux-musl/rustup-init"; \
1414
wget "$url"; \
15-
echo "44d689d8cf49165f059cafe10a5ce49708a26b0b0641169bc0e39ad9c54930d5 *rustup-init" | sha256sum -c -; \
15+
echo "0c86d467982bdf5c4b8d844bf8c3f7fc602cc4ac30b29262b8941d6d8b363d7e *rustup-init" | sha256sum -c -; \
1616
chmod +x rustup-init; \
1717
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION; \
1818
rm rustup-init; \

‎1.40.0/buster/Dockerfile‎ renamed to ‎1.41.0/buster/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ 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.40.0
6+
RUST_VERSION=1.41.0
77

88
RUN set -eux; \
99
dpkgArch="$(dpkg --print-architecture)"; \
1010
case "${dpkgArch##*-}" in \
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' ;; \
11+
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='ad1f8b5199b3b9e231472ed7aa08d2e5d1d539198a15c5b1e53c746aad81d27b' ;; \
12+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='6c6c3789dabf12171c7f500e06d21d8004b5318a5083df8b0b02c0e5ef1d017b' ;; \
13+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='26942c80234bac34b3c1352abbd9187d3e23b43dae3cf56a9f9c1ea8ee53076d' ;; \
14+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='27ae12bc294a34e566579deba3e066245d09b8871dc021ef45fc715dced05297' ;; \
1515
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
1616
esac; \
17-
url="https://static.rust-lang.org/rustup/archive/1.20.2/${rustArch}/rustup-init"; \
17+
url="https://static.rust-lang.org/rustup/archive/1.21.1/${rustArch}/rustup-init"; \
1818
wget "$url"; \
1919
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2020
chmod +x rustup-init; \

‎1.40.0/buster/slim/Dockerfile‎ renamed to ‎1.41.0/buster/slim/Dockerfile‎

Lines changed: 6 additions & 6 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.40.0
6+
RUST_VERSION=1.41.0
77

88
RUN set -eux; \
99
apt-get update; \
@@ -15,13 +15,13 @@ RUN set -eux; \
1515
; \
1616
dpkgArch="$(dpkg --print-architecture)"; \
1717
case "${dpkgArch##*-}" in \
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' ;; \
18+
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='ad1f8b5199b3b9e231472ed7aa08d2e5d1d539198a15c5b1e53c746aad81d27b' ;; \
19+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='6c6c3789dabf12171c7f500e06d21d8004b5318a5083df8b0b02c0e5ef1d017b' ;; \
20+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='26942c80234bac34b3c1352abbd9187d3e23b43dae3cf56a9f9c1ea8ee53076d' ;; \
21+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='27ae12bc294a34e566579deba3e066245d09b8871dc021ef45fc715dced05297' ;; \
2222
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
2323
esac; \
24-
url="https://static.rust-lang.org/rustup/archive/1.20.2/${rustArch}/rustup-init"; \
24+
url="https://static.rust-lang.org/rustup/archive/1.21.1/${rustArch}/rustup-init"; \
2525
wget "$url"; \
2626
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2727
chmod +x rustup-init; \

‎1.40.0/stretch/Dockerfile‎ renamed to ‎1.41.0/stretch/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ 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.40.0
6+
RUST_VERSION=1.41.0
77

88
RUN set -eux; \
99
dpkgArch="$(dpkg --print-architecture)"; \
1010
case "${dpkgArch##*-}" in \
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' ;; \
11+
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='ad1f8b5199b3b9e231472ed7aa08d2e5d1d539198a15c5b1e53c746aad81d27b' ;; \
12+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='6c6c3789dabf12171c7f500e06d21d8004b5318a5083df8b0b02c0e5ef1d017b' ;; \
13+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='26942c80234bac34b3c1352abbd9187d3e23b43dae3cf56a9f9c1ea8ee53076d' ;; \
14+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='27ae12bc294a34e566579deba3e066245d09b8871dc021ef45fc715dced05297' ;; \
1515
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
1616
esac; \
17-
url="https://static.rust-lang.org/rustup/archive/1.20.2/${rustArch}/rustup-init"; \
17+
url="https://static.rust-lang.org/rustup/archive/1.21.1/${rustArch}/rustup-init"; \
1818
wget "$url"; \
1919
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2020
chmod +x rustup-init; \

‎1.40.0/stretch/slim/Dockerfile‎ renamed to ‎1.41.0/stretch/slim/Dockerfile‎

Lines changed: 6 additions & 6 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.40.0
6+
RUST_VERSION=1.41.0
77

88
RUN set -eux; \
99
apt-get update; \
@@ -15,13 +15,13 @@ RUN set -eux; \
1515
; \
1616
dpkgArch="$(dpkg --print-architecture)"; \
1717
case "${dpkgArch##*-}" in \
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' ;; \
18+
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='ad1f8b5199b3b9e231472ed7aa08d2e5d1d539198a15c5b1e53c746aad81d27b' ;; \
19+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='6c6c3789dabf12171c7f500e06d21d8004b5318a5083df8b0b02c0e5ef1d017b' ;; \
20+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='26942c80234bac34b3c1352abbd9187d3e23b43dae3cf56a9f9c1ea8ee53076d' ;; \
21+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='27ae12bc294a34e566579deba3e066245d09b8871dc021ef45fc715dced05297' ;; \
2222
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
2323
esac; \
24-
url="https://static.rust-lang.org/rustup/archive/1.20.2/${rustArch}/rustup-init"; \
24+
url="https://static.rust-lang.org/rustup/archive/1.21.1/${rustArch}/rustup-init"; \
2525
wget "$url"; \
2626
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2727
chmod +x rustup-init; \

‎x.py‎

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

9-
rust_version = "1.40.0"
10-
rustup_version = "1.20.2"
9+
rust_version = "1.41.0"
10+
rustup_version = "1.21.1"
1111

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

@@ -30,8 +30,7 @@
3030
"3.11",
3131
]
3232

33-
# FIXME switch to 3.11 for 1.41.0
34-
default_alpine_version = "3.10"
33+
default_alpine_version = "3.11"
3534

3635
def rustup_hash(arch):
3736
url = f"https://static.rust-lang.org/rustup/archive/{rustup_version}/{arch}/rustup-init.sha256"

0 commit comments

Comments
 (0)