From 38c4eb1558a1aed991425ae7f4aabdfadf6229a7 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Thu, 19 Mar 2020 15:05:07 -0400 Subject: [PATCH 1/2] Add Ubuntu 20.04 Focal Fossa Signed-off-by: DeeDeeG --- README.md | 1 + deb/Makefile | 2 +- deb/ubuntu-focal/Dockerfile | 40 +++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 deb/ubuntu-focal/Dockerfile diff --git a/README.md b/README.md index 514fb4b3a8..845f751b6d 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ This repository is solely maintained by Docker, Inc. The scripts will build for this list of packages types: +* DEB packages for Ubuntu 20.04 Focal * DEB packages for Ubuntu 19.10 Eoan * DEB packages for Ubuntu 19.04 Disco * DEB packages for Ubuntu 18.10 Cosmic diff --git a/deb/Makefile b/deb/Makefile index 64bd37f478..98962a756d 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -40,7 +40,7 @@ RUN?=docker run --rm \ debbuild-$@/$(ARCH) DEBIAN_VERSIONS := debian-stretch debian-buster -UBUNTU_VERSIONS := ubuntu-xenial ubuntu-bionic ubuntu-cosmic ubuntu-disco ubuntu-eoan +UBUNTU_VERSIONS := ubuntu-xenial ubuntu-bionic ubuntu-cosmic ubuntu-disco ubuntu-eoan ubuntu-focal RASPBIAN_VERSIONS := raspbian-stretch raspbian-buster DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS) diff --git a/deb/ubuntu-focal/Dockerfile b/deb/ubuntu-focal/Dockerfile new file mode 100644 index 0000000000..5a55183192 --- /dev/null +++ b/deb/ubuntu-focal/Dockerfile @@ -0,0 +1,40 @@ +ARG GO_IMAGE +ARG DISTRO=ubuntu +ARG SUITE=focal +ARG BUILD_IMAGE=${DISTRO}:${SUITE} + +FROM ${GO_IMAGE} AS golang + +FROM ${BUILD_IMAGE} + +# Remove diverted man binary to prevent man-pages being replaced with "minimized" message. See docker/for-linux#639 +RUN if [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then \ + rm -f /usr/bin/man; \ + dpkg-divert --quiet --remove --rename /usr/bin/man; \ + fi + +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 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"] From 6960b126bd2c7a2bf7631f1ee2306cfed3dea445 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Mon, 6 Apr 2020 18:52:43 -0400 Subject: [PATCH 2/2] deb: Use noninteractive debian frontend for focal Signed-off-by: DeeDeeG --- deb/ubuntu-focal/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/deb/ubuntu-focal/Dockerfile b/deb/ubuntu-focal/Dockerfile index 5a55183192..e69204a43b 100644 --- a/deb/ubuntu-focal/Dockerfile +++ b/deb/ubuntu-focal/Dockerfile @@ -13,6 +13,7 @@ RUN if [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then dpkg-divert --quiet --remove --rename /usr/bin/man; \ fi +ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y curl devscripts equivs git ENV GOPROXY=direct