kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix the clashing route syntax for checkpoint/container delete.

Browse source 
Signed-off-by: boucher <rboucher@gmail.com>
This commit is contained in:
boucher 2016-08-30 10:10:44 -04:00
parent cb0ad4258b
commit 0dfbf960d7
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/server/router/checkpoint/checkpoint_experimental.go
View file

@ -10,6 +10,6 @@ func (r *checkpointRouter) initRoutes() {
r.routes = []router.Route{ r.routes = []router.Route{
router.NewGetRoute("/containers/{name:.*}/checkpoints", r.getContainerCheckpoints), router.NewGetRoute("/containers/{name:.*}/checkpoints", r.getContainerCheckpoints),
router.NewPostRoute("/containers/{name:.*}/checkpoints", r.postContainerCheckpoint), router.NewPostRoute("/containers/{name:.*}/checkpoints", r.postContainerCheckpoint),
router.NewDeleteRoute("/containers/{name:.*}/checkpoints/{checkpoint:.*}", r.deleteContainerCheckpoint), router.NewDeleteRoute("/containers/{name}/checkpoints/{checkpoint}", r.deleteContainerCheckpoint),
} }
} }

11
cmd/dockerd/daemon.go
View file

@ -398,18 +398,23 @@ func loadDaemonCliConfig(opts daemonOptions) (*daemon.Config, error) {
func initRouter(s *apiserver.Server, d *daemon.Daemon, c *cluster.Cluster) { func initRouter(s *apiserver.Server, d *daemon.Daemon, c *cluster.Cluster) {
decoder := runconfig.ContainerDecoder{} decoder := runconfig.ContainerDecoder{}
routers := []router.Router{ routers := []router.Router{}
// we need to add the checkpoint router before the container router or the DELETE gets masked
routers = addExperimentalRouters(routers, d, decoder)
routers = append(routers, []router.Router{
container.NewRouter(d, decoder), container.NewRouter(d, decoder),
image.NewRouter(d, decoder), image.NewRouter(d, decoder),
systemrouter.NewRouter(d, c), systemrouter.NewRouter(d, c),
volume.NewRouter(d), volume.NewRouter(d),
build.NewRouter(dockerfile.NewBuildManager(d)), build.NewRouter(dockerfile.NewBuildManager(d)),
swarmrouter.NewRouter(c), swarmrouter.NewRouter(c),
} }...)
if d.NetworkControllerEnabled() { if d.NetworkControllerEnabled() {
routers = append(routers, network.NewRouter(d, c)) routers = append(routers, network.NewRouter(d, c))
} }
routers = addExperimentalRouters(routers, d, decoder)
s.InitRouter(utils.IsDebugEnabled(), routers...) s.InitRouter(utils.IsDebugEnabled(), routers...)
} }