From 519e39ceaa7f9e00319149b9d74b243466fa3963 Mon Sep 17 00:00:00 2001 From: Nick Neisen Date: Mon, 22 Jan 2024 14:19:49 -0700 Subject: [PATCH] Add bookworm build (#303) --- packaging/deb/Makefile | 2 +- packaging/deb/debian-bookworm/Dockerfile | 34 ++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 packaging/deb/debian-bookworm/Dockerfile diff --git a/packaging/deb/Makefile b/packaging/deb/Makefile index 10f158789..91c98f80a 100644 --- a/packaging/deb/Makefile +++ b/packaging/deb/Makefile @@ -36,7 +36,7 @@ RUN=docker run --rm -i \ SOURCE_FILES=app.tgz cri-docker.service cri-docker.socket SOURCES=$(addprefix sources/, $(SOURCE_FILES)) -DEBIAN_VERSIONS := debian-bullseye +DEBIAN_VERSIONS := debian-bullseye debian-bookworm #UBUNTU_VERSIONS := ubuntu-xenial ubuntu-bionic ubuntu-cosmic ubuntu-disco ubuntu-eoan UBUNTU_VERSIONS := ubuntu-bionic ubuntu-focal ubuntu-jammy RASPBIAN_VERSIONS := raspbian-bullseye diff --git a/packaging/deb/debian-bookworm/Dockerfile b/packaging/deb/debian-bookworm/Dockerfile new file mode 100644 index 000000000..ed91386ff --- /dev/null +++ b/packaging/deb/debian-bookworm/Dockerfile @@ -0,0 +1,34 @@ +ARG GO_IMAGE +ARG DISTRO=debian +ARG SUITE=bookworm +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 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 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"]