Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ test_steps = [
try {
checkout scm
sh "make REF=$branch checkout"
sh "make -C deb ubuntu-xenial ubuntu-focal"
sh "make -C deb ubuntu-xenial ubuntu-focal debian-bullseye"
} finally {
sh "make clean"
}
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ The scripts will build for this list of packages types:
* DEB packages for Ubuntu 20.04 Focal
* DEB packages for Ubuntu 18.04 Bionic
* DEB packages for Ubuntu 16.04 Xenial
* DEB packages for Debian 11 BullsEye
* DEB packages for Debian 10 Buster
* RPM packages for Fedora 33
* RPM packages for Fedora 32
Expand Down
2 changes: 1 addition & 1 deletion deb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN?=docker run --rm \
$(RUN_FLAGS) \
debbuild-$@/$(ARCH)

DEBIAN_VERSIONS ?= debian-buster
DEBIAN_VERSIONS ?= debian-buster debian-bullseye
UBUNTU_VERSIONS ?= ubuntu-xenial ubuntu-bionic ubuntu-focal ubuntu-groovy
RASPBIAN_VERSIONS ?= raspbian-buster
DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS)
Expand Down
36 changes: 36 additions & 0 deletions deb/debian-bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
ARG GO_IMAGE
ARG DISTRO=debian
ARG SUITE=bullseye
ARG BUILD_IMAGE=${DISTRO}:${SUITE}

FROM ${GO_IMAGE} AS golang

FROM ${BUILD_IMAGE}

ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y curl devscripts equivs git

ENV GOPROXY=direct
ENV GO111MODULE=off
ENV GOPATH /go
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
ENV RUNC_BUILDTAGS apparmor seccomp selinux

ARG COMMON_FILES
COPY ${COMMON_FILES} /root/build-deb/debian
RUN apt-get update \
&& mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" -i /root/build-deb/debian/control

COPY sources/ /sources
ARG DISTRO
ARG SUITE
ENV DISTRO=${DISTRO}
ENV SUITE=${SUITE}

COPY --from=golang /usr/local/go /usr/local/go

WORKDIR /root/build-deb
COPY build-deb /root/build-deb/build-deb

ENTRYPOINT ["/root/build-deb/build-deb"]