Skip to content

Commit 5f31dd1

Browse files
authored
Merge pull request #43 from rust-lang/buster
Add buster images
2 parents 8b50bd6 + 64d9173 commit 5f31dd1

File tree

5 files changed

+67
-2
lines changed

5 files changed

+67
-2
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ language: bash
22
services: docker
33

44
env:
5+
- VERSION=1.36.0 VARIANT=buster/slim
6+
- VERSION=1.36.0 VARIANT=buster
57
- VERSION=1.36.0 VARIANT=stretch/slim
68
- VERSION=1.36.0 VARIANT=stretch
79

1.36.0/buster/Dockerfile

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
FROM buildpack-deps:buster
2+
3+
ENV RUSTUP_HOME=/usr/local/rustup \
4+
CARGO_HOME=/usr/local/cargo \
5+
PATH=/usr/local/cargo/bin:$PATH \
6+
RUST_VERSION=1.36.0
7+
8+
RUN set -eux; \
9+
dpkgArch="$(dpkg --print-architecture)"; \
10+
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' ;; \
15+
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
16+
esac; \
17+
url="https://static.rust-lang.org/rustup/archive/1.18.3/${rustArch}/rustup-init"; \
18+
wget "$url"; \
19+
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
20+
chmod +x rustup-init; \
21+
./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION; \
22+
rm rustup-init; \
23+
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
24+
rustup --version; \
25+
cargo --version; \
26+
rustc --version;

1.36.0/buster/slim/Dockerfile

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
FROM debian:buster-slim
2+
3+
ENV RUSTUP_HOME=/usr/local/rustup \
4+
CARGO_HOME=/usr/local/cargo \
5+
PATH=/usr/local/cargo/bin:$PATH \
6+
RUST_VERSION=1.36.0
7+
8+
RUN set -eux; \
9+
apt-get update; \
10+
apt-get install -y --no-install-recommends \
11+
ca-certificates \
12+
gcc \
13+
libc6-dev \
14+
wget \
15+
; \
16+
dpkgArch="$(dpkg --print-architecture)"; \
17+
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' ;; \
22+
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
23+
esac; \
24+
url="https://static.rust-lang.org/rustup/archive/1.18.3/${rustArch}/rustup-init"; \
25+
wget "$url"; \
26+
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
27+
chmod +x rustup-init; \
28+
./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION; \
29+
rm rustup-init; \
30+
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
31+
rustup --version; \
32+
cargo --version; \
33+
rustc --version; \
34+
apt-get remove -y --auto-remove \
35+
wget \
36+
; \
37+
rm -rf /var/lib/apt/lists/*;

generate-stackbrew-library.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ for version in "${versions[@]}"; do
6060
debianSuite="${debianSuites[$version]:-$defaultDebianSuite}"
6161

6262
for v in \
63-
{stretch,jessie}{,/slim} \
63+
{stretch,buster}{,/slim} \
6464
; do
6565
dir="$version/$v"
6666
variant="$(basename "$v")"

update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ for version in "${versions[@]}"; do
2929
linuxArchCase+=$' ''*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; '$'\\\n'
3030
linuxArchCase+=$' ''esac'
3131

32-
for variant in jessie stretch; do
32+
for variant in stretch buster; do
3333
if [ -d "$version/$variant" ]; then
3434
sed -r \
3535
-e 's!%%RUST-VERSION%%!'"$version"'!g' \

0 commit comments

Comments
 (0)