disable go mod, rediff patch and rebuild with current go runtime; rel 2

diff --git a/docker-ce.spec b/docker-ce.spec
index cf9bd2d1160e0ee250aa40ac7e56118a9e225214..8d1438d14da2df4d972640cb5f85a3f08312d801 100644 (file)
--- a/docker-ce.spec
+++ b/docker-ce.spec
@@ -22,7 +22,7 @@ Name:         docker-ce
 # Using Docker-CE, Stay on Stable channel
 # https://docs.docker.com/engine/installation/
 Version:       19.03.14
-Release:       1
+Release:       2
 License:       Apache v2.0
 Group:         Applications/System
 # https://github.com/docker/docker-ce/releases
@@ -172,6 +172,7 @@ grep -rhE "=%{runc_commit}|=%{containerd_commit}|=%{libnetwork_commit}" $(pwd)/c
 export VERSION=%{version}-ce # for `docker version`
 export GITCOMMIT="PLD-Linux/%{version}" # for cli
 export DOCKER_GITCOMMIT="PLD-Linux/%{version}" # for engine
+export GO111MODULE=off
 
 # build runc
 sed -i -e 's,shell git,shell false,' runc/Makefile

diff --git a/systemd.patch b/systemd.patch
index 09e49eb47f286cd03154d6abb0f0427435796769..da44eb382ba881ab6b735008818d733c66897ed3 100644 (file)
--- a/systemd.patch
+++ b/systemd.patch
@@ -12,5 +12,5 @@
 -ExecStart=/usr/bin/dockerd -H fd://
 +ExecStart=/usr/sbin/dockerd -H fd:// $OPTIONS
  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.