summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2017-01-23 08:02:25 -0600
committerWilliam Hubbs <williamh@gentoo.org>2017-01-23 08:02:48 -0600
commit07664ff8c9aa6fcb44d31937ba53ed51d02c030f (patch)
treed1974dadfffcb78dd44b0a308b89a59ecfdbbc7a /app-emulation/docker/files
parentapp-emulation/docker: stabilize 1.12.6 (diff)
downloadgentoo-07664ff8c9aa6fcb44d31937ba53ed51d02c030f.tar.gz
gentoo-07664ff8c9aa6fcb44d31937ba53ed51d02c030f.tar.bz2
gentoo-07664ff8c9aa6fcb44d31937ba53ed51d02c030f.zip
app-emulation/docker: remove old versions
Package-Manager: Portage-2.3.0, Repoman-2.3.1
Diffstat (limited to 'app-emulation/docker/files')
-rw-r--r--app-emulation/docker/files/docker-containerd.patch22
1 files changed, 0 insertions, 22 deletions
diff --git a/app-emulation/docker/files/docker-containerd.patch b/app-emulation/docker/files/docker-containerd.patch
deleted file mode 100644
index c53e82eda808..000000000000
--- a/app-emulation/docker/files/docker-containerd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/libcontainerd/remote_linux.go b/libcontainerd/remote_linux.go
-index f0284ca..e44a1d1 100644
---- a/libcontainerd/remote_linux.go
-+++ b/libcontainerd/remote_linux.go
-@@ -27,7 +27,7 @@ const (
- maxConnectionRetryCount = 3
- connectionRetryDelay = 3 * time.Second
- containerdShutdownTimeout = 15 * time.Second
-- containerdBinary = "docker-containerd"
-+ containerdBinary = "containerd"
- containerdPidFilename = "docker-containerd.pid"
- containerdSockFilename = "docker-containerd.sock"
- eventTimestampFilename = "event.ts"
-@@ -338,7 +338,7 @@ func (r *remote) runContainerdDaemon() error {
- }
-
- // Start a new instance
-- args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc"}
-+ args := []string{"-l", r.rpcAddr, "--runtime", "runc"}
- if r.debugLog {
- args = append(args, "--debug", "true")
- }