Skip to content

Commit a571e78

Browse files
committed
Revert "Merge pull request rust-lang#205 from Muscraft/remove-buster"
delete x.py, I don't plan on using it and it conflicted on revert This reverts commit 1a07514, reversing changes made to 4197463.
1 parent 55470d0 commit a571e78

File tree

5 files changed

+81
-297
lines changed

5 files changed

+81
-297
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ jobs:
2424
matrix:
2525
include:
2626
#VERSIONS
27+
- name: buster
28+
variant: buster
29+
- name: slim-buster
30+
variant: buster/slim
2731
- name: bullseye
2832
variant: bullseye
2933
- name: slim-bullseye

.github/workflows/nightly.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ jobs:
2121
matrix:
2222
include:
2323
#VERSIONS
24+
- name: buster
25+
context: nightly/buster
26+
platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386
27+
tags: |
28+
nightly-buster
29+
- name: slim-buster
30+
context: nightly/buster/slim
31+
platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386
32+
tags: |
33+
nightly-buster-slim
2434
- name: bullseye
2535
context: nightly/bullseye
2636
platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386

1.79.0/buster/Dockerfile

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
FROM buildpack-deps:buster
2+
3+
LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
4+
5+
ENV RUSTUP_HOME=/usr/local/rustup \
6+
CARGO_HOME=/usr/local/cargo \
7+
PATH=/usr/local/cargo/bin:$PATH \
8+
RUST_VERSION=1.79.0
9+
10+
RUN set -eux; \
11+
dpkgArch="$(dpkg --print-architecture)"; \
12+
case "${dpkgArch##*-}" in \
13+
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \
14+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3c4114923305f1cd3b96ce3454e9e549ad4aa7c07c03aec73d1a785e98388bed' ;; \
15+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \
16+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='0a6bed6e9f21192a51f83977716466895706059afb880500ff1d0e751ada5237' ;; \
17+
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
18+
esac; \
19+
url="https://static.rust-lang.org/rustup/archive/1.27.1/${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 --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
24+
rm rustup-init; \
25+
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
26+
rustup --version; \
27+
cargo --version; \
28+
rustc --version;

1.79.0/buster/slim/Dockerfile

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
FROM debian:buster-slim
2+
3+
LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
4+
5+
ENV RUSTUP_HOME=/usr/local/rustup \
6+
CARGO_HOME=/usr/local/cargo \
7+
PATH=/usr/local/cargo/bin:$PATH \
8+
RUST_VERSION=1.79.0
9+
10+
RUN set -eux; \
11+
apt-get update; \
12+
apt-get install -y --no-install-recommends \
13+
ca-certificates \
14+
gcc \
15+
libc6-dev \
16+
wget \
17+
; \
18+
dpkgArch="$(dpkg --print-architecture)"; \
19+
case "${dpkgArch##*-}" in \
20+
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \
21+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3c4114923305f1cd3b96ce3454e9e549ad4aa7c07c03aec73d1a785e98388bed' ;; \
22+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \
23+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='0a6bed6e9f21192a51f83977716466895706059afb880500ff1d0e751ada5237' ;; \
24+
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
25+
esac; \
26+
url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init"; \
27+
wget "$url"; \
28+
echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
29+
chmod +x rustup-init; \
30+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
31+
rm rustup-init; \
32+
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
33+
rustup --version; \
34+
cargo --version; \
35+
rustc --version; \
36+
apt-get remove -y --auto-remove \
37+
wget \
38+
; \
39+
rm -rf /var/lib/apt/lists/*;

x.py

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

0 commit comments

Comments
 (0)