From 1456fda3ec36d29f80ea24e905b10e93a6d7a04b Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 20 Sep 2018 11:42:29 +0200 Subject: [PATCH 1/7] change home page link for deb pkgs Signed-off-by: Sebastiaan van Stijn (cherry picked from commit a4df8fe1f86f38ad935862eb188b6fc234d22793) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 702f6a07fccef45343368895d105bb3e79ad2339 Component: packaging --- components/packaging/deb/common/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/deb/common/control b/components/packaging/deb/common/control index d45e144702..0d04c29c48 100644 --- a/components/packaging/deb/common/control +++ b/components/packaging/deb/common/control @@ -9,7 +9,7 @@ Build-Depends: bash-completion, make, gcc Standards-Version: 3.9.6 -Homepage: https://docker.com +Homepage: https://www.docker.com Vcs-Browser: https://github.com/docker/docker Vcs-Git: git://github.com/docker/docker.git From 4827d551d29a9b564c619b29b7f9a43aa41df178 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 20 Sep 2018 11:45:13 +0200 Subject: [PATCH 2/7] change some wording in package description Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 1a3379642fb37457d0249ae99385d17ddc85a6af) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 56bed5f33d75bf297c8f3c2018a34aaa30cfe9da Component: packaging --- components/packaging/deb/common/control | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/packaging/deb/common/control b/components/packaging/deb/common/control index 0d04c29c48..cf31d62f7a 100644 --- a/components/packaging/deb/common/control +++ b/components/packaging/deb/common/control @@ -27,11 +27,11 @@ Recommends: aufs-tools, Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine, docker-engine-cs Replaces: docker-engine Description: Docker: the open-source application container engine - Docker is an open source project to build, ship and run any application as a + Docker is a product for you to build, ship and run any application as a lightweight container . Docker containers are both hardware-agnostic and platform-agnostic. This means - they can run anywhere, from your laptop to the largest EC2 compute instance and + they can run anywhere, from your laptop to the largest cloud compute instance and everything in between - and they don't require you to use a particular language, framework or packaging system. That makes them great building blocks for deploying and scaling web apps, databases, and backend services without @@ -43,11 +43,11 @@ Depends: ${shlibs:Depends} Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine, docker-engine-cs Breaks: docker-ce (<< 18.06~) Description: Docker CLI: the open-source application container engine - Docker is an open source project to build, ship and run any application as a + Docker is a product for you to build, ship and run any application as a lightweight container . Docker containers are both hardware-agnostic and platform-agnostic. This means - they can run anywhere, from your laptop to the largest EC2 compute instance and + they can run anywhere, from your laptop to the largest cloud compute instance and everything in between - and they don't require you to use a particular language, framework or packaging system. That makes them great building blocks for deploying and scaling web apps, databases, and backend services without From eb465533d36671526f4ac906fa9e53fde268a458 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 20 Sep 2018 12:40:10 +0200 Subject: [PATCH 3/7] more updates to package descriptions Signed-off-by: Sebastiaan van Stijn Upstream-commit: eb89f3ebd68033fe49b12016ad07f28cfc33d874 Component: packaging --- components/packaging/rpm/SPECS/docker-ce-cli.spec | 4 ++-- components/packaging/rpm/SPECS/docker-ce.spec | 4 ++-- components/packaging/rpm/centos-7/docker-ce.spec | 4 ++-- components/packaging/rpm/fedora-27/docker-ce.spec | 4 ++-- components/packaging/rpm/fedora-28/docker-ce.spec | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/packaging/rpm/SPECS/docker-ce-cli.spec b/components/packaging/rpm/SPECS/docker-ce-cli.spec index 883507c676..d5b89a45fa 100644 --- a/components/packaging/rpm/SPECS/docker-ce-cli.spec +++ b/components/packaging/rpm/SPECS/docker-ce-cli.spec @@ -32,11 +32,11 @@ Obsoletes: docker-engine-selinux Obsoletes: docker-engine %description -Docker is an open source project to build, ship and run any application as a +Docker is is a product for you to build, ship and run any application as a lightweight container. Docker containers are both hardware-agnostic and platform-agnostic. This means -they can run anywhere, from your laptop to the largest EC2 compute instance and +they can run anywhere, from your laptop to the largest cloud compute instance and everything in between - and they don't require you to use a particular language, framework or packaging system. That makes them great building blocks for deploying and scaling web apps, databases, and backend services without diff --git a/components/packaging/rpm/SPECS/docker-ce.spec b/components/packaging/rpm/SPECS/docker-ce.spec index 74d06ec685..3be4cb4589 100644 --- a/components/packaging/rpm/SPECS/docker-ce.spec +++ b/components/packaging/rpm/SPECS/docker-ce.spec @@ -38,11 +38,11 @@ Obsoletes: docker-engine-selinux Obsoletes: docker-engine %description -Docker is an open source project to build, ship and run any application as a +Docker is is a product for you to build, ship and run any application as a lightweight container. Docker containers are both hardware-agnostic and platform-agnostic. This means -they can run anywhere, from your laptop to the largest EC2 compute instance and +they can run anywhere, from your laptop to the largest cloud compute instance and everything in between - and they don't require you to use a particular language, framework or packaging system. That makes them great building blocks for deploying and scaling web apps, databases, and backend services without diff --git a/components/packaging/rpm/centos-7/docker-ce.spec b/components/packaging/rpm/centos-7/docker-ce.spec index e9762f3be3..e8c76d8307 100644 --- a/components/packaging/rpm/centos-7/docker-ce.spec +++ b/components/packaging/rpm/centos-7/docker-ce.spec @@ -54,11 +54,11 @@ Obsoletes: docker-engine-selinux Obsoletes: docker-engine %description -Docker is an open source project to build, ship and run any application as a +Docker is is a product for you to build, ship and run any application as a lightweight container. Docker containers are both hardware-agnostic and platform-agnostic. This means -they can run anywhere, from your laptop to the largest EC2 compute instance and +they can run anywhere, from your laptop to the largest cloud compute instance and everything in between - and they don't require you to use a particular language, framework or packaging system. That makes them great building blocks for deploying and scaling web apps, databases, and backend services without diff --git a/components/packaging/rpm/fedora-27/docker-ce.spec b/components/packaging/rpm/fedora-27/docker-ce.spec index 712a4ca508..d646a1e327 100644 --- a/components/packaging/rpm/fedora-27/docker-ce.spec +++ b/components/packaging/rpm/fedora-27/docker-ce.spec @@ -54,11 +54,11 @@ Obsoletes: docker-engine-selinux Obsoletes: docker-engine %description -Docker is an open source project to build, ship and run any application as a +Docker is is a product for you to build, ship and run any application as a lightweight container. Docker containers are both hardware-agnostic and platform-agnostic. This means -they can run anywhere, from your laptop to the largest EC2 compute instance and +they can run anywhere, from your laptop to the largest cloud compute instance and everything in between - and they don't require you to use a particular language, framework or packaging system. That makes them great building blocks for deploying and scaling web apps, databases, and backend services without diff --git a/components/packaging/rpm/fedora-28/docker-ce.spec b/components/packaging/rpm/fedora-28/docker-ce.spec index 712a4ca508..d646a1e327 100644 --- a/components/packaging/rpm/fedora-28/docker-ce.spec +++ b/components/packaging/rpm/fedora-28/docker-ce.spec @@ -54,11 +54,11 @@ Obsoletes: docker-engine-selinux Obsoletes: docker-engine %description -Docker is an open source project to build, ship and run any application as a +Docker is is a product for you to build, ship and run any application as a lightweight container. Docker containers are both hardware-agnostic and platform-agnostic. This means -they can run anywhere, from your laptop to the largest EC2 compute instance and +they can run anywhere, from your laptop to the largest cloud compute instance and everything in between - and they don't require you to use a particular language, framework or packaging system. That makes them great building blocks for deploying and scaling web apps, databases, and backend services without From 0ef2a783ef1a2444b047b6c6c54302507e1ed635 Mon Sep 17 00:00:00 2001 From: Justin Clift Date: Thu, 30 Aug 2018 13:41:58 +0100 Subject: [PATCH 4/7] Update outdated Fedora versions (cherry picked from commit f0212649020ad5a1b0ca17c61ab500992ac981b4) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 5f5601309ac7c0814b077166aa3b101c8bfce6fe Component: packaging --- components/packaging/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/README.md b/components/packaging/README.md index 46aa5f1491..f8dbdf7a8b 100644 --- a/components/packaging/README.md +++ b/components/packaging/README.md @@ -15,7 +15,7 @@ The scripts will build for this list of packages types: * DEB packages for Debian 9 Stretch * DEB packages for Debian 8 Jessie * DEB packages for Debian 7 Wheezy +* RPM packages for Fedora 28 * RPM packages for Fedora 27 -* RPM packages for Fedora 26 * RPM packages for CentOS 7 * TGZ and ZIP files with static binaries From 76823a4d2983cf7eb684e9c6e0c30ddfd300d172 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 20 Sep 2018 16:06:01 +0200 Subject: [PATCH 5/7] Revert "Specify suffix for DEB_VERSION" This reverts commit 6c5b7fcb956871f7a44e1a478ad9450f9df4bed1. Signed-off-by: Sebastiaan van Stijn Upstream-commit: 00104664c15a6025451ae766b77b78b347ee1ad3 Component: packaging --- components/packaging/deb/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index 9e0c2d4e10..e11b5cc3ee 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -8,8 +8,7 @@ VERSION?=0.0.0-dev GO_BASE_IMAGE=golang GO_VERSION:=1.10.4 GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION) -SUFFIX=ce -DEB_VERSION?=$(shell SUFFIX=$(SUFFIX) ./gen-deb-ver $(CLI_DIR) "$(VERSION)") +DEB_VERSION=$(shell ./gen-deb-ver $(CLI_DIR) "$(VERSION)") CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown EPOCH?=4 From be5df7c46bb7221fdaa67019e8c037a497db987b Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 20 Sep 2018 10:05:03 -0700 Subject: [PATCH 6/7] systemd/docker.service: fix PATH Set the PATH to what appears to be the standard on latest Ubuntu (18.04) and Debian (9), fixing the following two issues: 1. PATH did not contain /bin (leading to ContainerTop/ps not working on newer distros, among the other things). 2. $PATH can't be specified in Environment directives in .service files. Signed-off-by: Kir Kolyshkin Upstream-commit: 62d9a0d1253049a2fab10f938542a8e09dd0804a Component: packaging --- components/packaging/systemd/docker.service | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/packaging/systemd/docker.service b/components/packaging/systemd/docker.service index be1617069f..d8b2efebc7 100644 --- a/components/packaging/systemd/docker.service +++ b/components/packaging/systemd/docker.service @@ -26,9 +26,8 @@ StartLimitBurst=3 # this option work for either version of systemd. StartLimitInterval=60s -# On RPM Based distributions PATH isn't defined so we define it here # /opt/containerd/bin is in front so dockerd grabs the correct runc binary -Environment="PATH=/opt/containerd/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:$PATH" +Environment="PATH=/opt/containerd/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" # Having non-zero Limit*s causes performance problems due to accounting overhead # in the kernel. We recommend using cgroups to do container-local accounting. From 49de0c314f6dfda70337c03719b5e53581dd0272 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 20 Sep 2018 10:16:39 -0700 Subject: [PATCH 7/7] deb/systemd: remove These files are not used, and having them in repo is misleading. Signed-off-by: Kir Kolyshkin Upstream-commit: fca673ad8051d1b377435821ec6c76c0de24b663 Component: packaging --- .../packaging/deb/systemd/docker.service | 34 ------------------- .../packaging/deb/systemd/docker.socket | 12 ------- 2 files changed, 46 deletions(-) delete mode 100644 components/packaging/deb/systemd/docker.service delete mode 100644 components/packaging/deb/systemd/docker.socket diff --git a/components/packaging/deb/systemd/docker.service b/components/packaging/deb/systemd/docker.service deleted file mode 100644 index 517463172b..0000000000 --- a/components/packaging/deb/systemd/docker.service +++ /dev/null @@ -1,34 +0,0 @@ -[Unit] -Description=Docker Application Container Engine -Documentation=https://docs.docker.com -After=network-online.target docker.socket firewalld.service -Wants=network-online.target -Requires=docker.socket - -[Service] -Type=notify -# the default is not to use systemd for cgroups because the delegate issues still -# exists and systemd currently does not support the cgroup feature set required -# for containers run by docker -ExecStart=/usr/bin/dockerd -H fd:// -ExecReload=/bin/kill -s HUP $MAINPID -LimitNOFILE=1048576 -# Having non-zero Limit*s causes performance problems due to accounting overhead -# in the kernel. We recommend using cgroups to do container-local accounting. -LimitNPROC=infinity -LimitCORE=infinity -# Uncomment TasksMax if your systemd version supports it. -# Only systemd 226 and above support this version. -#TasksMax=infinity -TimeoutStartSec=0 -# set delegate yes so that systemd does not reset the cgroups of docker containers -Delegate=yes -# kill only the docker process, not all processes in the cgroup -KillMode=process -# restart the docker process if it exits prematurely -Restart=on-failure -StartLimitBurst=3 -StartLimitInterval=60s - -[Install] -WantedBy=multi-user.target diff --git a/components/packaging/deb/systemd/docker.socket b/components/packaging/deb/systemd/docker.socket deleted file mode 100644 index 7dd95098e4..0000000000 --- a/components/packaging/deb/systemd/docker.socket +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Docker Socket for the API -PartOf=docker.service - -[Socket] -ListenStream=/var/run/docker.sock -SocketMode=0660 -SocketUser=root -SocketGroup=docker - -[Install] -WantedBy=sockets.target