Pārlūkot izejas kodu

make remove network return 204

Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit ea07ef7a7c3a221d6167cc2e36806ed9615ac973)
Signed-off-by: Victor Vieux <vieux@docker.com>
allencloud 8 gadi atpakaļ
vecāks
revīzija
180d122c5b

+ 5 - 1
api/server/router/network/network_routes.go

@@ -161,7 +161,11 @@ func (n *networkRouter) deleteNetwork(ctx context.Context, w http.ResponseWriter
 		return err
 		return err
 	}
 	}
 	if _, err := n.clusterProvider.GetNetwork(vars["id"]); err == nil {
 	if _, err := n.clusterProvider.GetNetwork(vars["id"]); err == nil {
-		return n.clusterProvider.RemoveNetwork(vars["id"])
+		if err = n.clusterProvider.RemoveNetwork(vars["id"]); err != nil {
+			return err
+		}
+		w.WriteHeader(http.StatusNoContent)
+		return nil
 	}
 	}
 	if err := n.backend.DeleteNetwork(vars["id"]); err != nil {
 	if err := n.backend.DeleteNetwork(vars["id"]); err != nil {
 		return err
 		return err

+ 3 - 1
docs/reference/api/docker_remote_api_v1.24.md

@@ -4668,7 +4668,9 @@ Stop and remove the service `id`
 
 
 **Example response**:
 **Example response**:
 
 
-    HTTP/1.1 200 No Content
+    HTTP/1.1 200 OK
+    Content-Length: 0
+    Content-Type: text/plain; charset=utf-8
 
 
 **Status codes**:
 **Status codes**:
 
 

+ 3 - 1
docs/reference/api/docker_remote_api_v1.25.md

@@ -4704,7 +4704,9 @@ Stop and remove the service `id`
 
 
 **Example response**:
 **Example response**:
 
 
-    HTTP/1.1 200 No Content
+    HTTP/1.1 200 OK
+    Content-Length: 0
+    Content-Type: text/plain; charset=utf-8
 
 
 **Status codes**:
 **Status codes**: