From f144247e35717ebad82fcf8aa7c0d8e10798095b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 7 Jul 2017 10:43:52 -0700 Subject: [PATCH 1/7] Add LICENSE (copy of docker/docker's Apache-2.0 file) Signed-off-by: Tianon Gravi (cherry picked from commit e258ed20012a9abf2b40e8a224f62453e5a6f8aa) Signed-off-by: Sebastiaan van Stijn --- LICENSE | 191 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..9c8e20ab85 --- /dev/null +++ b/LICENSE @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2013-2017 Docker, Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From e6539d2af3218e66767ef8175e02ba2e8e25ac42 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 4 Mar 2020 09:39:20 +0100 Subject: [PATCH 2/7] deb: remove unused DOCKER_GOPATH variable This variable was added in 09b3ac888d8d6ab625e56a458f6bd6f72b1ba0c2 but appears to be unused. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit c4c61802fdd618e597541439b96a6e04b9017a5a) Signed-off-by: Sebastiaan van Stijn --- deb/common/rules | 1 - 1 file changed, 1 deletion(-) diff --git a/deb/common/rules b/deb/common/rules index 57035dba7d..e914b61c95 100755 --- a/deb/common/rules +++ b/deb/common/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f VERSION ?= $(shell cat engine/VERSION) -DOCKER_GOPATH := /go/src/github.com/docker override_dh_gencontrol: # if we're on Ubuntu, we need to Recommends: apparmor From 7027d9106da4689e704e5c062b86e69a6d7d2485 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Thu, 27 Feb 2020 12:39:48 +0100 Subject: [PATCH 3/7] Update README to include Ubuntu 19.10 Signed-off-by: Christopher Crone (cherry picked from commit 762501e2c3ca77fcfb533fce9e32fd2ef5462382) Signed-off-by: Sebastiaan van Stijn --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ef5dea01a9..d3966c506a 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 19.10 Eoan * DEB packages for Ubuntu 19.04 Disco * DEB packages for Ubuntu 18.10 Cosmic * DEB packages for Ubuntu 18.04 Bionic From 0af89263871c97465209618bdb5d815ff339b7af Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 2 Apr 2020 11:31:24 +0200 Subject: [PATCH 4/7] deb: add missing format version dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1) ... dpkg-source: info: using source format '1.0' Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 895cade68c2114b76c365ec5439a37f4f5edd03f) Signed-off-by: Sebastiaan van Stijn --- deb/common/source/format | 1 + 1 file changed, 1 insertion(+) create mode 100644 deb/common/source/format diff --git a/deb/common/source/format b/deb/common/source/format new file mode 100644 index 0000000000..d3827e75a5 --- /dev/null +++ b/deb/common/source/format @@ -0,0 +1 @@ +1.0 From cf5f1a7f72d6e113de94edc4af9a660e74d38bca Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Thu, 5 Dec 2019 15:11:39 -0800 Subject: [PATCH 5/7] Add build target for ubuntu-eoan Signed-off-by: Arko Dasgupta (cherry picked from commit d87aaa3f7c7bebea5b7327f782c3e4746c4935cd) Signed-off-by: Sebastiaan van Stijn --- deb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/Makefile b/deb/Makefile index 23cf3400d1..29a3212d27 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -39,7 +39,7 @@ SOURCE_FILES=cli.tgz engine.tgz docker.service docker.socket plugin-installers.t SOURCES=$(addprefix sources/, $(SOURCE_FILES)) DEBIAN_VERSIONS := debian-stretch debian-buster -UBUNTU_VERSIONS := ubuntu-xenial ubuntu-bionic ubuntu-cosmic ubuntu-disco +UBUNTU_VERSIONS := ubuntu-xenial ubuntu-bionic ubuntu-cosmic ubuntu-disco ubuntu-eoan RASPBIAN_VERSIONS := raspbian-stretch raspbian-buster DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS) From a0cdb993c9381cc6d814e02190f8235a79238215 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Thu, 19 Mar 2020 15:05:07 -0400 Subject: [PATCH 6/7] Add Ubuntu 20.04 Focal Fossa Signed-off-by: DeeDeeG Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 1baf61ac948ab1366021d036618898ac7c363d63) 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 d3966c506a..9ec99e960d 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 29a3212d27..cb1b23c6c9 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -39,7 +39,7 @@ SOURCE_FILES=cli.tgz engine.tgz docker.service docker.socket plugin-installers.t SOURCES=$(addprefix sources/, $(SOURCE_FILES)) 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 1d692ac4f41fb1340a6534f8fb32c8573713b36b Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 11 Apr 2020 00:16:42 +0200 Subject: [PATCH 7/7] Enable Ubuntu Focal in Jenkinsfile Signed-off-by: Sebastiaan van Stijn (cherry picked from commit f1a0fdbd9563c02dc418239da69b7b05dcc3cd14) 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') }