Skip to content

Commit 1d8ef29

Browse files
sfacklersfackler
committed
Update to 1.38.0
1 parent 16fead3 commit 1d8ef29

File tree

9 files changed

+36
-47
lines changed

9 files changed

+36
-47
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.37.0 VARIANT=stretch
7-
- VERSION=1.37.0 VARIANT=stretch/slim
8-
- VERSION=1.37.0 VARIANT=buster
9-
- VERSION=1.37.0 VARIANT=buster/slim
10-
- VERSION=1.37.0 VARIANT=alpine3.10
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
1111
#VERSIONS
1212

1313
install:

‎1.37.0/release-architectures‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎1.37.0/rustup-version‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ 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.37.0
10+
RUST_VERSION=1.38.0
1111

1212
RUN set -eux; \
1313
url="https://static.rust-lang.org/rustup/archive/1.19.0/x86_64-unknown-linux-musl/rustup-init"; \

‎1.37.0/buster/Dockerfile‎ renamed to ‎1.38.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.37.0
6+
RUST_VERSION=1.38.0
77

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

‎1.37.0/buster/slim/Dockerfile‎ renamed to ‎1.38.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.37.0
6+
RUST_VERSION=1.38.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='a46fe67199b7bcbbde2dcbc23ae08db6f29883e260e23899a88b9073effc9076' ;; \
19-
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='6af5abbbae02e13a9acae29593ec58116ab0e3eb893fa0381991e8b0934caea1' ;; \
20-
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='51862e576f064d859546cca5f3d32297092a850861e567327422e65b60877a1b' ;; \
21-
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='91456c3e6b2a3067914b3327f07bc182e2a27c44bff473263ba81174884182be' ;; \
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' ;; \
2222
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
2323
esac; \
24-
url="https://static.rust-lang.org/rustup/archive/1.18.3/${rustArch}/rustup-init"; \
24+
url="https://static.rust-lang.org/rustup/archive/1.19.0/${rustArch}/rustup-init"; \
2525
wget "$url"; \
2626
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2727
chmod +x rustup-init; \

‎1.37.0/stretch/Dockerfile‎ renamed to ‎1.38.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.37.0
6+
RUST_VERSION=1.38.0
77

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

‎1.37.0/stretch/slim/Dockerfile‎ renamed to ‎1.38.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.37.0
6+
RUST_VERSION=1.38.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='a46fe67199b7bcbbde2dcbc23ae08db6f29883e260e23899a88b9073effc9076' ;; \
19-
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='6af5abbbae02e13a9acae29593ec58116ab0e3eb893fa0381991e8b0934caea1' ;; \
20-
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='51862e576f064d859546cca5f3d32297092a850861e567327422e65b60877a1b' ;; \
21-
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='91456c3e6b2a3067914b3327f07bc182e2a27c44bff473263ba81174884182be' ;; \
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' ;; \
2222
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
2323
esac; \
24-
url="https://static.rust-lang.org/rustup/archive/1.18.3/${rustArch}/rustup-init"; \
24+
url="https://static.rust-lang.org/rustup/archive/1.19.0/${rustArch}/rustup-init"; \
2525
wget "$url"; \
2626
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
2727
chmod +x rustup-init; \

‎x.py‎

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

9-
rust_version = "1.37.0"
10-
rustup_version = "1.18.3"
9+
rust_version = "1.38.0"
10+
rustup_version = "1.19.0"
1111

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

@@ -31,10 +31,8 @@
3131

3232
default_alpine_version = "3.10"
3333

34-
def rustup_hash(arch, version=None):
35-
if version is None:
36-
version = rustup_version
37-
url = f"https://static.rust-lang.org/rustup/archive/{version}/{arch}/rustup-init.sha256"
34+
def rustup_hash(arch):
35+
url = f"https://static.rust-lang.org/rustup/archive/{rustup_version}/{arch}/rustup-init.sha256"
3836
with request.urlopen(url) as f:
3937
return f.read().decode('utf-8').split()[0]
4038

@@ -78,14 +76,13 @@ def update_debian():
7876

7977
def update_alpine():
8078
template = read_file("Dockerfile-alpine.template")
81-
alpine_rustup_version = "1.19.0"
8279

8380
for version in alpine_versions:
8481
rendered = template \
8582
.replace("%%RUST-VERSION%%", rust_version) \
86-
.replace("%%RUSTUP-VERSION%%", alpine_rustup_version) \
83+
.replace("%%RUSTUP-VERSION%%", rustup_version) \
8784
.replace("%%TAG%%", version) \
88-
.replace("%%RUSTUP-SHA256%%", rustup_hash("x86_64-unknown-linux-musl", alpine_rustup_version))
85+
.replace("%%RUSTUP-SHA256%%", rustup_hash("x86_64-unknown-linux-musl"))
8986
write_file(f"{rust_version}/alpine{version}/Dockerfile", rendered)
9087

9188
def update_travis():

0 commit comments

Comments
 (0)