Merge branch 'main' into docker_rebuild_config

Signed-off-by: Alex Lau(AvengerMoJo) <avengermojo@gmail.com>

internal/app/run/runner.go

@@ -184,7 +184,7 @@ func (r *Runner) run(ctx context.Context, task *runnerv1.Task, reporter *report.
 
 		ReuseContainers:       false,
 		ForcePull:             r.cfg.Container.ForcePull,
-		ForceRebuild:          false,
+		ForceRebuild:          r.cfg.Container.ForceRebuild,
 		LogOutput:             true,
 		JSONLogger:            false,
 		Env:                   r.envs,

internal/pkg/config/config.example.yaml

@@ -82,6 +82,8 @@ container:
   docker_host: ""
   # Pull docker image(s) even if already present
   force_pull: false
+  # Rebuild docker image(s) even if already present
+  force_rebuild: false
 
 host:
   # The parent directory of a job's working directory.

internal/pkg/config/config.go

@@ -51,6 +51,7 @@ type Container struct {
 	ValidVolumes  []string `yaml:"valid_volumes"`  // ValidVolumes specifies the volumes (including bind mounts) can be mounted to containers.
 	DockerHost    string   `yaml:"docker_host"`    // DockerHost specifies the Docker host. It overrides the value specified in environment variable DOCKER_HOST.
 	ForcePull     bool     `yaml:"force_pull"`     // Pull docker image(s) even if already present
+	ForceRebuild  bool     `yaml:"force_rebuild"`  // Rebuild docker image(s) even if already present
 }
 
 // Host represents the configuration for the host.