diff --git a/docker-compose.yml b/docker-compose.yml index 64155cc9..12e1a011 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -54,6 +54,9 @@ services: - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY} - SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY} - SHUFFLE_STATS_DISABLED=true + - SHUFFLE_SWARM_CONFIG=run + - SHUFFLE_LOGS_DISABLED=true + - SHUFFLE_WORKER_IMAGE=ghcr.io/shuffle/shuffle-worker:nightly env_file: .env restart: unless-stopped security_opt: diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go index 6ba7ca41..1781f246 100755 --- a/functions/onprem/orborus/orborus.go +++ b/functions/onprem/orborus/orborus.go @@ -1255,6 +1255,28 @@ func deployWorker(image string, identifier string, env []string, executionReques Resources: container.Resources{}, } + certPath := "/certs" + + // This is just to test the mounting locally so + // I can control from what source I'm mounting + // the certs to. Default behaviour is: + // /certs:/certs. + if os.Getenv("SHUFFLE_CERT_PATH") != "" { + certPath = os.Getenv("SHUFFLE_CERT_PATH") + } + + _, err := os.ReadDir(certPath) + + if certPath != "" && err == nil { + certVol := mount.Mount{ + Type: mount.TypeBind, + Source: certPath, + Target: "/certs", + } + + hostConfig.Mounts = append(hostConfig.Mounts, certVol) + } + if len(os.Getenv("DOCKER_HOST")) == 0 { if runtime.GOOS == "windows" { hostConfig.Binds = []string{`\\.\pipe\docker_engine:\\.\pipe\docker_engine`}