Commit Graph

8 Commits

Author SHA1 Message Date
1ba2a2621f Bump proxy to 35c543b
Includes fixes related to upgrade cycles

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 83a20d53f14adcd2bcc9e932435aa66b6e056afa)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: befa3c61954d12f2413df56a384989d7ae2cb9b3
Component: packaging
2018-09-12 06:00:21 -07:00
14fc3fe7f5 Update proxy commit for shutdown timeouts
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 7941c692e67a67f011881bff1d200a2fcaeb6568)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 61d98f8540f8ef37e4940a6799077490a5756ebe
Component: packaging
2018-09-05 22:39:47 +00:00
546163ada0 update containerd proxy commit to afca176
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: eea6967f5de4835800349b1bcf2b81de8fd92207
Component: packaging
2018-08-24 22:14:20 +00:00
51edf81efb use systemctl is-active to check for containerd
The other way was not working.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit f00df1bf1efa2ed1ea508ea7b1c291500441571d)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: a9b0387bb0f40bd7687d8653a0714724eb66f3b9
Component: packaging
2018-08-23 16:57:41 +00:00
4b8490a8fe Improve containerd detection, don't rely on root
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 2134ee524ecf6a96c99a518652b4ec65680abc34
Component: packaging
2018-08-16 00:10:04 +00:00
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
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
1f463af629 Add containerd-shim-process installation
Also split off containerd.mk into it's own thing since most of this
stuff will be re-used with debian packaging anyways.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 5513629a1b4868d82a41249eac634edbff51e315
Component: packaging
2018-08-14 16:50:27 +00:00