Commit Graph
5 Commits
Author SHA1 Message Date
Eli Uriegas dbc4cb6ea0 Set containerd to be a systemd bind for docker
The daemon won't actually start without containerd

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 16037618282dc5076089c7b749cdd07376650f8d
Component: packaging
2018-08-20 21:17:32 +00:00
Eli Uriegas cbac77a8f2 Some changes to get this working on CentOS 7
Old versions of things on CentOS 7 strike again!

infinity is not a thing for TimeoutSec on systemd < 229

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 86dafe5391e2ef298248536cd038e27230a4df63
Component: packaging
2018-08-16 04:03:40 +00:00
Eli Uriegas 4670e93b92 Revive pre / post steps, update offline location
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 558cd9c4bb28a11fe1ff3da45a4efd19265d7ce5
Component: packaging
2018-08-15 23:17:54 +00:00
Eli Uriegas 4a4db9a651 Round out systemd for RPM packaging
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: f99ffa4b5ef8c85fa5fbeb8fdc95403f9a02ceaf
Component: packaging
2018-08-15 23:01:10 +00:00
Eli Uriegas 03fa2aa531 Add systemd files, add containerd-proxy config
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 481c39539b723230a258f02e3d33d3baed03d2ce
Component: packaging
2018-08-14 20:30:22 +00:00