From d3c3f5e1e0f0edc7d39e88af2ad0f2a8841727d0 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Wed, 18 May 2022 12:15:03 +0200 Subject: [PATCH] disable go mod, rediff patch and rebuild with current go runtime; rel 2 --- docker-ce.spec | 3 ++- systemd.patch | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-ce.spec b/docker-ce.spec index cf9bd2d..8d1438d 100644 --- 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 09e49eb..da44eb3 100644 --- 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. -- 2.44.0