Skip to content

fix(docker/client): dont clear entrypoint for step-level docker executor #1403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yottahmd merged 1 commit into from
Nov 11, 2025
Merged

fix(docker/client): dont clear entrypoint for step-level docker executor #1403

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions internal/runtime/builtin/docker/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ func (c *Client) CreateContainerKeepAlive(ctx context.Context) error {
c.cancel = cancel
c.cancelMu.Unlock()

ctID, err := c.startNewContainer(ctx, c.cfg.ContainerName, c.cli, cmd)
ctID, err := c.startNewContainer(ctx, c.cfg.ContainerName, c.cli, cmd, true)
if err != nil {
return fmt.Errorf("failed to start a new container: %w", err)
}
Expand Down Expand Up @@ -371,7 +371,7 @@ func (c *Client) Run(ctx context.Context, cmd []string, stdout, stderr io.Writer
// If container is not running, start a new one
// The container should be stopped and removed after run with autoRemove
// set to true.
ctID, err := c.startNewContainer(ctx, c.cfg.ContainerName, c.cli, cmd)
ctID, err := c.startNewContainer(ctx, c.cfg.ContainerName, c.cli, cmd, false)
if err != nil {
return errorExitCode, fmt.Errorf("failed to start a new container: %w", err)
}
Expand Down Expand Up @@ -445,7 +445,7 @@ func (c *Client) Stop(sig os.Signal) error {
return nil
}

func (c *Client) startNewContainer(ctx context.Context, name string, cli *client.Client, cmd []string) (string, error) {
func (c *Client) startNewContainer(ctx context.Context, name string, cli *client.Client, cmd []string, clearEntrypoint bool) (string, error) {
pull, err := c.shouldPullImage(ctx, cli, &c.platform)
if err != nil {
return "", err
Expand Down Expand Up @@ -482,8 +482,10 @@ func (c *Client) startNewContainer(ctx context.Context, name string, cli *client

if len(cmd) > 0 {
ctCfg.Cmd = cmd
// Entrypoint should be empty slice to override image ENTRYPOINT
ctCfg.Entrypoint = []string{}
if clearEntrypoint {
// Entrypoint should be empty slice to override image ENTRYPOINT
ctCfg.Entrypoint = []string{}
}
}

resp, err := cli.ContainerCreate(
Expand Down
Loading