Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit851e669

Browse files
authored
Merge pull request#243 from paolobarbolini/trixie
Add Debian trixie variant
2 parents1f194bf +521720d commit851e669

File tree

7 files changed

+157
-0
lines changed

7 files changed

+157
-0
lines changed

‎.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ jobs:
3232
variant:bookworm
3333
-name:slim-bookworm
3434
variant:bookworm/slim
35+
-name:trixie
36+
variant:trixie
37+
-name:slim-trixie
38+
variant:trixie/slim
3539
-name:alpine3.20
3640
variant:alpine3.20
3741
-name:alpine3.21

‎.github/workflows/nightly.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,16 @@ jobs:
4343
tags:|
4444
nightly-bookworm-slim
4545
nightly-slim
46+
-name:trixie
47+
context:nightly/trixie
48+
platforms:linux/amd64,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le,linux/s390x
49+
tags:|
50+
nightly-trixie
51+
-name:slim-trixie
52+
context:nightly/trixie/slim
53+
platforms:linux/amd64,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le,linux/s390x
54+
tags:|
55+
nightly-trixie-slim
4656
-name:alpine3.20
4757
context:nightly/alpine3.20
4858
platforms:linux/amd64,linux/arm64

‎nightly/trixie/Dockerfile

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
FROM buildpack-deps:trixie
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=nightly
9+
10+
RUN set -eux; \
11+
dpkgArch="$(dpkg --print-architecture)"; \
12+
case"${dpkgArch##*-}" in \
13+
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
14+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
15+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
16+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
17+
ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
18+
s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
19+
*) echo >&2"unsupported architecture: ${dpkgArch}"; exit 1 ;; \
20+
esac; \
21+
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
22+
wget"$url"; \
23+
echo"${rustupSha256} *rustup-init" | sha256sum -c -; \
24+
chmod +x rustup-init; \
25+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
26+
rm rustup-init; \
27+
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
28+
rustup --version; \
29+
cargo --version; \
30+
rustc --version;

‎nightly/trixie/slim/Dockerfile

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
FROM debian:trixie-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=nightly
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='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
21+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
22+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
23+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
24+
ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
25+
s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
26+
*) echo >&2"unsupported architecture: ${dpkgArch}"; exit 1 ;; \
27+
esac; \
28+
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
29+
wget"$url"; \
30+
echo"${rustupSha256} *rustup-init" | sha256sum -c -; \
31+
chmod +x rustup-init; \
32+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
33+
rm rustup-init; \
34+
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
35+
rustup --version; \
36+
cargo --version; \
37+
rustc --version; \
38+
apt-get remove -y --auto-remove \
39+
wget \
40+
; \
41+
rm -rf /var/lib/apt/lists/*;

‎stable/trixie/Dockerfile

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
FROM buildpack-deps:trixie
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.88.0
9+
10+
RUN set -eux; \
11+
dpkgArch="$(dpkg --print-architecture)"; \
12+
case"${dpkgArch##*-}" in \
13+
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
14+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
15+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
16+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
17+
ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
18+
s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
19+
*) echo >&2"unsupported architecture: ${dpkgArch}"; exit 1 ;; \
20+
esac; \
21+
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
22+
wget"$url"; \
23+
echo"${rustupSha256} *rustup-init" | sha256sum -c -; \
24+
chmod +x rustup-init; \
25+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
26+
rm rustup-init; \
27+
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
28+
rustup --version; \
29+
cargo --version; \
30+
rustc --version;

‎stable/trixie/slim/Dockerfile

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
FROM debian:trixie-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.88.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='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
21+
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
22+
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
23+
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
24+
ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
25+
s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
26+
*) echo >&2"unsupported architecture: ${dpkgArch}"; exit 1 ;; \
27+
esac; \
28+
url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
29+
wget"$url"; \
30+
echo"${rustupSha256} *rustup-init" | sha256sum -c -; \
31+
chmod +x rustup-init; \
32+
./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
33+
rm rustup-init; \
34+
chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
35+
rustup --version; \
36+
cargo --version; \
37+
rustc --version; \
38+
apt-get remove -y --auto-remove \
39+
wget \
40+
; \
41+
rm -rf /var/lib/apt/lists/*;

‎x.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
debian_variants= [
3636
DebianVariant("bullseye",debian_lts_arches),
3737
DebianVariant("bookworm",debian_lts_arches+debian_non_lts_arches),
38+
DebianVariant("trixie",debian_lts_arches+debian_non_lts_arches),
3839
]
3940

4041
default_debian_variant="bookworm"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp