Skip to content

Commit bf30ee6

Browse files
committed
Add 1.20.0
1 parent 969b0b0 commit bf30ee6

File tree

6 files changed

+68
-3
lines changed

6 files changed

+68
-3
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ language: bash
22
services: docker
33

44
env:
5-
- VERSION=1.19.0 VARIANT=stretch
6-
- VERSION=1.19.0 VARIANT=jessie
5+
- VERSION=1.20.0 VARIANT=stretch
6+
- VERSION=1.20.0 VARIANT=jessie
77

88
install:
99
- git clone https://github.com/docker-library/official-images.git ~/official-images

1.20.0/jessie/Dockerfile

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
FROM buildpack-deps:jessie
2+
3+
ENV RUSTUP_HOME=/usr/local/rustup \
4+
CARGO_HOME=/usr/local/cargo \
5+
PATH=/usr/local/cargo/bin:$PATH
6+
7+
RUN set -eux; \
8+
\
9+
# this "case" statement is generated via "update.sh"
10+
dpkgArch="$(dpkg --print-architecture)"; \
11+
case "${dpkgArch##*-}" in \
12+
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='f5833a64fd549971be80fa42cffc6c5e7f51c4f443cd46e90e4c17919c24481f' ;; \
13+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='67a98a67f7f7bf19c5cde166499acb8299f2f8fa88c155093df53b66da1f512a' ;; \
14+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='82fe368c4ebf1683d57e137242793a4417042639aace8bd514601db7d79d3645' ;; \
15+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='7a1c085591f6c1305877919f8495c04a1c97546d001d1357a7a879cedea5afbb' ;; \
16+
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
17+
esac; \
18+
\
19+
url="https://static.rust-lang.org/rustup/archive/1.6.0/${rustArch}/rustup-init"; \
20+
wget "$url"; \
21+
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
22+
chmod +x rustup-init; \
23+
./rustup-init -y --no-modify-path --default-toolchain 1.20.0; \
24+
rm rustup-init; \
25+
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
26+
rustup --version; \
27+
cargo --version; \
28+
rustc --version;

1.20.0/release-architectures

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# see https://github.com/rust-lang-nursery/rustup.rs#other-installation-methods
2+
3+
# bashbrew-arch dpkg-arch rust-arch
4+
amd64 amd64 x86_64-unknown-linux-gnu
5+
arm32v7 armhf armv7-unknown-linux-gnueabihf
6+
arm64v8 arm64 aarch64-unknown-linux-gnu
7+
i386 i386 i686-unknown-linux-gnu

1.20.0/rustup-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.6.0

1.20.0/stretch/Dockerfile

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
FROM buildpack-deps:stretch
2+
3+
ENV RUSTUP_HOME=/usr/local/rustup \
4+
CARGO_HOME=/usr/local/cargo \
5+
PATH=/usr/local/cargo/bin:$PATH
6+
7+
RUN set -eux; \
8+
\
9+
# this "case" statement is generated via "update.sh"
10+
dpkgArch="$(dpkg --print-architecture)"; \
11+
case "${dpkgArch##*-}" in \
12+
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='f5833a64fd549971be80fa42cffc6c5e7f51c4f443cd46e90e4c17919c24481f' ;; \
13+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='67a98a67f7f7bf19c5cde166499acb8299f2f8fa88c155093df53b66da1f512a' ;; \
14+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='82fe368c4ebf1683d57e137242793a4417042639aace8bd514601db7d79d3645' ;; \
15+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='7a1c085591f6c1305877919f8495c04a1c97546d001d1357a7a879cedea5afbb' ;; \
16+
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
17+
esac; \
18+
\
19+
url="https://static.rust-lang.org/rustup/archive/1.6.0/${rustArch}/rustup-init"; \
20+
wget "$url"; \
21+
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
22+
chmod +x rustup-init; \
23+
./rustup-init -y --no-modify-path --default-toolchain 1.20.0; \
24+
rm rustup-init; \
25+
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
26+
rustup --version; \
27+
cargo --version; \
28+
rustc --version;

generate-stackbrew-library.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
set -Eeuo pipefail
33

44
declare -A aliases=(
5-
[1.19.0]='1 1.19 latest'
5+
[1.20.0]='1 1.20 latest'
6+
[1.19.0]='1.19'
67
)
78

89
defaultDebianSuite='stretch'

0 commit comments

Comments
 (0)