Skip to content

Commit bcb36e2

Browse files
committed
stack deploy: fail early on invalid image reference format
Before this patch, `docker stack deploy` would not validate the image reference on the client side, depending on the daemon to return an error, which was not always easy to interpret; docker stack deploy -c docker-compose.yaml mystack Creating service mystack_myservice failed to create service mystack_myservice: Error response from daemon: rpc error: code = InvalidArgument desc = ContainerSpec: image reference must be provided IMAGE_NAME=FOOBAR docker stack deploy -c docker-compose.yaml mystack Creating service mystack_myservice failed to create service mystack_myservice: Error response from daemon: rpc error: code = InvalidArgument desc = ContainerSpec: "FOOBAR" is not a valid repository/tag With this patch, the CLI validates the image-reference for each service, producing an error if the reference is empty or invalid. docker stack config -c docker-compose.yaml invalid service myservice: no image specified IMAGE_NAME=FOOBAR ~/Projects/cli/build/docker stack deploy -c docker-compose.yaml mystack invalid image reference for service myservice: invalid reference format: repository name (library/FOOBAR) must be lowercase Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 61c6818 commit bcb36e2

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

cli/command/stack/loader/loader.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"sort"
1313
"strings"
1414

15+
"github.com/distribution/reference"
1516
"github.com/docker/cli/cli/command"
1617
"github.com/docker/cli/cli/command/stack/options"
1718
"github.com/docker/cli/cli/compose/loader"
@@ -49,6 +50,17 @@ func LoadComposefile(dockerCli command.Cli, opts options.Deploy) (*composetypes.
4950
_, _ = fmt.Fprintf(dockerCli.Err(), "Ignoring deprecated options:\n\n%s\n\n",
5051
propertyWarnings(deprecatedProperties))
5152
}
53+
54+
// Validate if each service has a valid image-reference.
55+
for _, svc := range config.Services {
56+
if svc.Image == "" {
57+
return nil, errors.Errorf("invalid image reference for service %s: no image specified", svc.Name)
58+
}
59+
if _, err := reference.ParseAnyReference(svc.Image); err != nil {
60+
return nil, errors.Wrapf(err, "invalid image reference for service %s", svc.Name)
61+
}
62+
}
63+
5264
return config, nil
5365
}
5466

0 commit comments

Comments
 (0)