Skip to content
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

Add option to configure the script executor (default is bash again) #41

Merged
merged 1 commit into from
Jan 24, 2024
Merged

Add option to configure the script executor (default is bash again) #41

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
11 changes: 7 additions & 4 deletions HadesScheduler/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package docker
import (
"context"
"fmt"
"strings"
"time"

"github.com/Mtze/HadesCI/shared/payload"
Expand All @@ -18,16 +19,17 @@ import (
var cli *client.Client
var global_envs []string = []string{}
var container_autoremove bool
var DockerCfg DockerConfig

type Scheduler struct{}

type DockerConfig struct {
DockerHost string `env:"DOCKER_HOST" envDefault:"unix:///var/run/docker.sock"`
ContainerAutoremove bool `env:"CONTAINER_AUTOREMOVE" envDefault:"true`
DockerHost string `env:"DOCKER_HOST" envDefault:"unix:///var/run/docker.sock"`
ContainerAutoremove bool `env:"CONTAINER_AUTOREMOVE" envDefault:"true`
DockerScriptExecutor string `env:"DOCKER_SCRIPT_EXECUTOR" envDefault:"/bin/bash -c"`
}

func init() {
var DockerCfg DockerConfig
utils.LoadConfig(&DockerCfg)
container_autoremove = DockerCfg.ContainerAutoremove

Expand Down Expand Up @@ -107,7 +109,8 @@ func executeStep(ctx context.Context, client *client.Client, step payload.Step,
// Create the bash script if there is one
if step.Script != "" {
// Overwrite the default entrypoint
container_config.Entrypoint = []string{"/bin/sh", "-c", step.Script}
container_config.Entrypoint = strings.Split(DockerCfg.DockerScriptExecutor, " ")
container_config.Entrypoint = append(container_config.Entrypoint, step.Script)
}

resp, err := client.ContainerCreate(ctx, &container_config, &host_config, nil, nil, "")
Expand Down
Loading