Skip to content

Commit 7889cc4

Browse files
authored
Merge pull request #521 from thaJeztah/debian_bullseye
deb: add support for building debian 11 "Bullseye"
2 parents 6929936 + 7b0be6b commit 7889cc4

File tree

4 files changed

+39
-2
lines changed

4 files changed

+39
-2
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test_steps = [
99
try {
1010
checkout scm
1111
sh "make REF=$branch checkout"
12-
sh "make -C deb ubuntu-xenial ubuntu-focal"
12+
sh "make -C deb ubuntu-xenial ubuntu-focal debian-bullseye"
1313
} finally {
1414
sh "make clean"
1515
}

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ The scripts will build for this list of packages types:
1010
* DEB packages for Ubuntu 20.04 Focal
1111
* DEB packages for Ubuntu 18.04 Bionic
1212
* DEB packages for Ubuntu 16.04 Xenial
13+
* DEB packages for Debian 11 BullsEye
1314
* DEB packages for Debian 10 Buster
1415
* RPM packages for Fedora 33
1516
* RPM packages for Fedora 32

deb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN?=docker run --rm \
3636
$(RUN_FLAGS) \
3737
debbuild-$@/$(ARCH)
3838

39-
DEBIAN_VERSIONS ?= debian-buster
39+
DEBIAN_VERSIONS ?= debian-buster debian-bullseye
4040
UBUNTU_VERSIONS ?= ubuntu-xenial ubuntu-bionic ubuntu-focal ubuntu-groovy
4141
RASPBIAN_VERSIONS ?= raspbian-buster
4242
DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS)

deb/debian-bullseye/Dockerfile

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

0 commit comments

Comments
 (0)