From 3675feadabb0b74d585f54bd4b0152971074e1a9 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Tue, 25 Sep 2018 00:55:29 +0000 Subject: [PATCH 1/3] rename binaries to remove docker prefix For static builds. Signed-off-by: Andrew Hsu Signed-off-by: Eli Uriegas Upstream-commit: 43ebdc0845840c13c2f92c7b564ddb56eb38d428 Component: packaging --- components/packaging/static/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/static/Makefile b/components/packaging/static/Makefile index dcf05e33cc..b3b254e26e 100644 --- a/components/packaging/static/Makefile +++ b/components/packaging/static/Makefile @@ -24,7 +24,7 @@ static: static-linux cross-mac cross-win cross-arm ## create all static packages static-linux: static-cli static-engine ## create tgz with linux x86_64 client and server mkdir -p build/linux/docker cp $(CLI_DIR)/build/docker build/linux/docker/ - for f in dockerd docker-containerd docker-containerd-ctr docker-containerd-shim docker-init docker-proxy docker-runc; do \ + for f in dockerd containerd containerd-ctr containerd-shim docker-init docker-proxy runc; do \ cp -L $(ENGINE_DIR)/bundles/binary-daemon/$$f build/linux/docker/$$f; \ done tar -C build/linux -c -z -f build/linux/docker-$(STATIC_VERSION).tgz docker From adcef4519f1d534a6700c48dc225428ffdfa7df1 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 25 Sep 2018 17:03:36 +0000 Subject: [PATCH 2/3] containerd-ctr -> ctr Signed-off-by: Eli Uriegas Upstream-commit: 75906054befc177621bc015ab0802e1fad18c187 Component: packaging --- components/packaging/static/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/static/Makefile b/components/packaging/static/Makefile index b3b254e26e..37bfb361e6 100644 --- a/components/packaging/static/Makefile +++ b/components/packaging/static/Makefile @@ -24,7 +24,7 @@ static: static-linux cross-mac cross-win cross-arm ## create all static packages static-linux: static-cli static-engine ## create tgz with linux x86_64 client and server mkdir -p build/linux/docker cp $(CLI_DIR)/build/docker build/linux/docker/ - for f in dockerd containerd containerd-ctr containerd-shim docker-init docker-proxy runc; do \ + for f in dockerd containerd ctr containerd-shim docker-init docker-proxy runc; do \ cp -L $(ENGINE_DIR)/bundles/binary-daemon/$$f build/linux/docker/$$f; \ done tar -C build/linux -c -z -f build/linux/docker-$(STATIC_VERSION).tgz docker From 552a0c76a28ec4f959c0e4158c09f5e104b12807 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Wed, 26 Sep 2018 18:15:23 +0000 Subject: [PATCH 3/3] Remove Environment, not needed anymore Signed-off-by: Eli Uriegas (cherry picked from commit 9eac27f0ee2d02355ecdeea243d2607d633c0b0b) Signed-off-by: Eli Uriegas Upstream-commit: 08dd353c77bb97339a3c8d1b11712cdd6323c436 Component: packaging --- components/packaging/systemd/docker.service | 3 --- 1 file changed, 3 deletions(-) diff --git a/components/packaging/systemd/docker.service b/components/packaging/systemd/docker.service index 7371b1355c..8f4c7d1177 100644 --- a/components/packaging/systemd/docker.service +++ b/components/packaging/systemd/docker.service @@ -25,9 +25,6 @@ StartLimitBurst=3 # this option work for either version of systemd. StartLimitInterval=60s -# /opt/containerd/bin is in front so dockerd grabs the correct runc binary -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. LimitNOFILE=infinity