feat(entrypoint): allow to override service ENTRYPOINT for run command

This commit is contained in:
Pavel Sviderski
2025-03-18 16:44:15 +10:00
parent e8715fce38
commit 1bbcfa8519
4 changed files with 34 additions and 16 deletions
+13
View File
@@ -14,6 +14,8 @@ import (
type runOptions struct {
command []string
entrypoint string
entrypointChanged bool
image string
machines []string
mode string
@@ -35,6 +37,7 @@ func NewRunCommand() *cobra.Command {
RunE: func(cmd *cobra.Command, args []string) error {
uncli := cmd.Context().Value("cli").(*cli.CLI)
opts.entrypointChanged = cmd.Flag("entrypoint").Changed
opts.image = args[0]
if len(args) > 1 {
opts.command = args[1:]
@@ -44,6 +47,8 @@ func NewRunCommand() *cobra.Command {
},
}
cmd.Flags().StringVar(&opts.entrypoint, "entrypoint", "",
"Overwrite the default ENTRYPOINT of the image. Pass an empty string \"\" to reset it.")
cmd.Flags().StringVar(&opts.mode, "mode", api.ServiceModeReplicated,
fmt.Sprintf("Replication mode of the service: either %q (a specified number of containers across "+
"the machines) or %q (one container on every machine).",
@@ -128,6 +133,14 @@ func run(ctx context.Context, uncli *cli.CLI, opts runOptions) error {
Ports: ports,
Replicas: opts.replicas,
}
// Overwrite the default ENTRYPOINT of the image or reset it if an empty string is passed.
if opts.entrypoint != "" {
spec.Container.Entrypoint = []string{opts.entrypoint}
} else if opts.entrypointChanged {
spec.Container.Entrypoint = []string{""}
}
if err := spec.Validate(); err != nil {
return fmt.Errorf("invalid service configuration: %w", err)
}
+1
View File
@@ -76,6 +76,7 @@ func (c *Container) ServiceSpec() (ServiceSpec, error) {
return ServiceSpec{
Container: ContainerSpec{
Command: c.Config.Cmd,
Entrypoint: c.Config.Entrypoint,
Image: c.Config.Image,
Init: c.HostConfig.Init,
Volumes: c.HostConfig.Binds,
+3
View File
@@ -67,7 +67,10 @@ func ValidateServiceID(id string) bool {
}
type ContainerSpec struct {
// Command overrides the default CMD of the image to be executed when running a container.
Command []string
// Entrypoint overrides the default ENTRYPOINT of the image.
Entrypoint []string
Image string
// Run a custom init inside the container. If nil, use the daemon's configured settings.
Init *bool
+1
View File
@@ -43,6 +43,7 @@ func (cli *Client) CreateContainer(
// TODO: calculate the spec hash and set it as a label to detect changes in the service spec.
config := &container.Config{
Cmd: spec.Container.Command,
Entrypoint: spec.Container.Entrypoint,
Hostname: containerName,
Image: spec.Container.Image,
Labels: map[string]string{