9c846b2fcc
Unlike a plain `net/http/client.Do()`, requests made through client/request use the `sendRequest` function, which parses the server response, and may convert non-transport errors into errors (through `cli.checkResponseErr()`). This means that we cannot assume that no reader was opened if an error is returned. This patch changes various locations where `ensureReaderClosed` was only called in the non-error situation, and uses a `defer` to make sure it's always called. `ensureReaderClosed` itself already checks if the response's body was set, so in situations where the error was due to a transport error, calling `ensureReaderClosed` should be a no-op. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
94 lines
2.8 KiB
Go
94 lines
2.8 KiB
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/url"
|
|
"strconv"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/swarm"
|
|
)
|
|
|
|
// ServiceUpdate updates a Service. The version number is required to avoid conflicting writes.
|
|
// It should be the value as set *before* the update. You can find this value in the Meta field
|
|
// of swarm.Service, which can be found using ServiceInspectWithRaw.
|
|
func (cli *Client) ServiceUpdate(ctx context.Context, serviceID string, version swarm.Version, service swarm.ServiceSpec, options types.ServiceUpdateOptions) (types.ServiceUpdateResponse, error) {
|
|
var (
|
|
query = url.Values{}
|
|
distErr error
|
|
)
|
|
|
|
headers := map[string][]string{
|
|
"version": {cli.version},
|
|
}
|
|
|
|
if options.EncodedRegistryAuth != "" {
|
|
headers["X-Registry-Auth"] = []string{options.EncodedRegistryAuth}
|
|
}
|
|
|
|
if options.RegistryAuthFrom != "" {
|
|
query.Set("registryAuthFrom", options.RegistryAuthFrom)
|
|
}
|
|
|
|
if options.Rollback != "" {
|
|
query.Set("rollback", options.Rollback)
|
|
}
|
|
|
|
query.Set("version", strconv.FormatUint(version.Index, 10))
|
|
|
|
if err := validateServiceSpec(service); err != nil {
|
|
return types.ServiceUpdateResponse{}, err
|
|
}
|
|
|
|
var imgPlatforms []swarm.Platform
|
|
// ensure that the image is tagged
|
|
if service.TaskTemplate.ContainerSpec != nil {
|
|
if taggedImg := imageWithTagString(service.TaskTemplate.ContainerSpec.Image); taggedImg != "" {
|
|
service.TaskTemplate.ContainerSpec.Image = taggedImg
|
|
}
|
|
if options.QueryRegistry {
|
|
var img string
|
|
img, imgPlatforms, distErr = imageDigestAndPlatforms(ctx, cli, service.TaskTemplate.ContainerSpec.Image, options.EncodedRegistryAuth)
|
|
if img != "" {
|
|
service.TaskTemplate.ContainerSpec.Image = img
|
|
}
|
|
}
|
|
}
|
|
|
|
// ensure that the image is tagged
|
|
if service.TaskTemplate.PluginSpec != nil {
|
|
if taggedImg := imageWithTagString(service.TaskTemplate.PluginSpec.Remote); taggedImg != "" {
|
|
service.TaskTemplate.PluginSpec.Remote = taggedImg
|
|
}
|
|
if options.QueryRegistry {
|
|
var img string
|
|
img, imgPlatforms, distErr = imageDigestAndPlatforms(ctx, cli, service.TaskTemplate.PluginSpec.Remote, options.EncodedRegistryAuth)
|
|
if img != "" {
|
|
service.TaskTemplate.PluginSpec.Remote = img
|
|
}
|
|
}
|
|
}
|
|
|
|
if service.TaskTemplate.Placement == nil && len(imgPlatforms) > 0 {
|
|
service.TaskTemplate.Placement = &swarm.Placement{}
|
|
}
|
|
if len(imgPlatforms) > 0 {
|
|
service.TaskTemplate.Placement.Platforms = imgPlatforms
|
|
}
|
|
|
|
var response types.ServiceUpdateResponse
|
|
resp, err := cli.post(ctx, "/services/"+serviceID+"/update", query, service, headers)
|
|
defer ensureReaderClosed(resp)
|
|
if err != nil {
|
|
return response, err
|
|
}
|
|
|
|
err = json.NewDecoder(resp.body).Decode(&response)
|
|
|
|
if distErr != nil {
|
|
response.Warnings = append(response.Warnings, digestWarning(service.TaskTemplate.ContainerSpec.Image))
|
|
}
|
|
|
|
return response, err
|
|
}
|