starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-24 07:25:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update containerd to 59bd1967112885c4d49e510e55701

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 5bd902b5cfbb360915b02fc2a787ae9e1c183405
Component: engine
This commit is contained in:
Michael Crosby
2017-11-29 19:15:14 -05:00
parent 006ed302fe
commit d9f34cfcb3
181 changed files with 7547 additions and 6801 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/hack/dockerfile/binaries-commits
+1 -1
View File
@@ -4,7 +4,7 @@ TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
# When updating RUNC_COMMIT, also update runc in vendor.conf accordingly
RUNC_COMMIT=b2567b37d7b75eb4cf325b77297b140ea686ce8f
CONTAINERD_COMMIT=v1.0.0-beta.3
CONTAINERD_COMMIT=59bd1967112885c4d49e510e5570182865ba6fdd
TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
VNDR_COMMIT=a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384
components/engine/hack/dockerfile/install-binaries.sh
+1 -1
View File
@@ -48,7 +48,7 @@ install_containerd_static() {
git checkout -q "$CONTAINERD_COMMIT"
(
export GOPATH
make EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\""
make BUILDTAGS='static_build' EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"'
)
cp bin/containerd /usr/local/bin/docker-containerd
cp bin/containerd-shim /usr/local/bin/docker-containerd-shim