From 1baf61ac948ab1366021d036618898ac7c363d63 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 Signed-off-by: Sebastiaan van Stijn --- README.md | 1 + deb/Makefile | 2 +- deb/ubuntu-focal/Dockerfile | 41 +++++++++++++++++++++++++++++++++++++ 3 files changed, 43 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..e69204a43b --- /dev/null +++ b/deb/ubuntu-focal/Dockerfile @@ -0,0 +1,41 @@ +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 + +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 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 f1a0fdbd9563c02dc418239da69b7b05dcc3cd14 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 11 Apr 2020 00:16:42 +0200 Subject: [PATCH 2/2] Enable Ubuntu Focal in Jenkinsfile Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8394ff01c1..4d5f7eeeb6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ def branch = env.CHANGE_TARGET ?: env.BRANCH_NAME test_steps = [ 'deb': { -> - stage('Ubuntu Xenial Debian Package') { + stage('Ubuntu Xenial and Focal Package') { wrappedNode(label: 'ubuntu && x86_64', cleanWorkspace: true) { try { checkout scm @@ -12,7 +12,7 @@ test_steps = [ sh("git -C cli checkout $branch") sh('git clone https://github.com/docker/engine.git') sh("git -C engine checkout $branch") - sh('make -C deb VERSION=0.0.1-dev ENGINE_DIR=$(pwd)/engine CLI_DIR=$(pwd)/cli ubuntu-xenial') + sh('make -C deb VERSION=0.0.1-dev ENGINE_DIR=$(pwd)/engine CLI_DIR=$(pwd)/cli ubuntu-xenial ubuntu-focal') } finally { sh('make ENGINE_DIR=$(pwd)/engine clean-engine') }