Skip to content

Commit e16f46b

Browse files
authored
Merge pull request #1181 from vvoland/debian-trixie
deb: Add Debian "Trixie"
2 parents 658fd99 + 6364c95 commit e16f46b

File tree

4 files changed

+43
-1
lines changed

4 files changed

+43
-1
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
target:
3434
- debian-bullseye
3535
- debian-bookworm
36+
- debian-trixie
3637
- ubuntu-focal
3738
- ubuntu-jammy
3839
- ubuntu-noble

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ def pkgs = [
77
[target: "centos-10", image: "quay.io/centos/centos:stream10", arches: ["amd64", "aarch64"]], // CentOS Stream 10 (EOL: 2030)
88
[target: "debian-bullseye", image: "debian:bullseye", arches: ["amd64", "aarch64", "armhf"]], // Debian 11 (oldstable, EOL: 2024-08-14, EOL (LTS): 2026-08-31)
99
[target: "debian-bookworm", image: "debian:bookworm", arches: ["amd64", "aarch64", "armhf"]], // Debian 12 (stable, EOL: 2026-06-10, EOL (LTS): 2028-06-30)
10+
[target: "debian-trixie", image: "debian:trixie", arches: ["amd64", "aarch64", "armhf"]], // Debian 13 (testing)
1011
[target: "fedora-40", image: "fedora:40", arches: ["amd64", "aarch64"]], // EOL: May 13, 2025
1112
[target: "fedora-41", image: "fedora:41", arches: ["amd64", "aarch64"]], // EOL: November 19, 2025
1213
[target: "fedora-42", image: "fedora:42", arches: ["amd64", "aarch64"]], // EOL: May 13, 2026

deb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ RUN?=docker run --rm \
5050
$(RUN_FLAGS) \
5151
debbuild-$@/$(ARCH)
5252

53-
DEBIAN_VERSIONS ?= debian-bullseye debian-bookworm
53+
DEBIAN_VERSIONS ?= debian-bullseye debian-bookworm debian-trixie
5454
UBUNTU_VERSIONS ?= ubuntu-focal ubuntu-jammy ubuntu-noble ubuntu-oracular ubuntu-plucky
5555
RASPBIAN_VERSIONS ?= raspbian-bullseye raspbian-bookworm
5656
DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS)

deb/debian-trixie/Dockerfile

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# syntax=docker/dockerfile:1
2+
3+
ARG GO_IMAGE=golang:latest
4+
ARG DISTRO=debian
5+
ARG SUITE=trixie
6+
ARG VERSION_ID=13
7+
ARG BUILD_IMAGE=${DISTRO}:${SUITE}
8+
9+
FROM ${GO_IMAGE} AS golang
10+
11+
FROM ${BUILD_IMAGE}
12+
13+
ARG DEBIAN_FRONTEND=noninteractive
14+
RUN apt-get update && apt-get install -y curl devscripts equivs git
15+
16+
ENV GOPROXY=https://proxy.golang.org|direct
17+
ENV GO111MODULE=off
18+
ENV GOPATH=/go
19+
ENV GOTOOLCHAIN=local
20+
ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
21+
22+
ARG COMMON_FILES
23+
COPY --link ${COMMON_FILES} /root/build-deb/debian
24+
RUN apt-get update \
25+
&& mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" -i /root/build-deb/debian/control
26+
27+
COPY --link sources/ /sources
28+
ARG DISTRO
29+
ARG SUITE
30+
ARG VERSION_ID
31+
ENV DISTRO=${DISTRO}
32+
ENV SUITE=${SUITE}
33+
ENV VERSION_ID=${VERSION_ID}
34+
35+
COPY --link --from=golang /usr/local/go /usr/local/go
36+
37+
WORKDIR /root/build-deb
38+
COPY build-deb /root/build-deb/build-deb
39+
40+
ENTRYPOINT ["/root/build-deb/build-deb"]

0 commit comments

Comments
 (0)