Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[18.09] Remove 'docker-' prefix for containerd and runc binaries #61

Merged
merged 3 commits into from
Sep 26, 2018
Merged

[18.09] Remove 'docker-' prefix for containerd and runc binaries #61

merged 3 commits into from
Sep 26, 2018

Commits on Sep 24, 2018

  1. Remove 'docker-' prefix for containerd and runc binaries 

    This allows to run the daemon in environments that have upstream containerd installed.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 34eede0)
Signed-off-by: Tibor Vass <tibor@docker.com>
    Tibor Vass committed Sep 24, 2018
    Configuration menu
    Copy the full SHA
    b3bb2aa View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2018

  1. hack/make: remove 'docker-' prefix when copying binaries 

    Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 361412c)
Signed-off-by: Tibor Vass <tibor@docker.com>
    Tibor Vass committed Sep 25, 2018
    Configuration menu
    Copy the full SHA
    e090646 View commit details
    Browse the repository at this point in the history

  2. fix daemon tests that were using wrong containerd socket 

    Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 52b60f7)
Signed-off-by: Tibor Vass <tibor@docker.com>
    Tibor Vass committed Sep 25, 2018
    Configuration menu
    Copy the full SHA
    6bf8dfc View commit details
    Browse the repository at this point in the history