Merge branch '2.0.0' of https://github.com/shuffle/shuffle into 2.0.0
This commit is contained in:
@@ -54,6 +54,9 @@ services:
|
|||||||
- SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
|
- SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
|
||||||
- SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
|
- SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
|
||||||
- SHUFFLE_STATS_DISABLED=true
|
- SHUFFLE_STATS_DISABLED=true
|
||||||
|
- SHUFFLE_SWARM_CONFIG=run
|
||||||
|
- SHUFFLE_LOGS_DISABLED=true
|
||||||
|
- SHUFFLE_WORKER_IMAGE=ghcr.io/shuffle/shuffle-worker:nightly
|
||||||
env_file: .env
|
env_file: .env
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
security_opt:
|
security_opt:
|
||||||
|
|||||||
@@ -1255,6 +1255,28 @@ func deployWorker(image string, identifier string, env []string, executionReques
|
|||||||
Resources: container.Resources{},
|
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 len(os.Getenv("DOCKER_HOST")) == 0 {
|
||||||
if runtime.GOOS == "windows" {
|
if runtime.GOOS == "windows" {
|
||||||
hostConfig.Binds = []string{`\\.\pipe\docker_engine:\\.\pipe\docker_engine`}
|
hostConfig.Binds = []string{`\\.\pipe\docker_engine:\\.\pipe\docker_engine`}
|
||||||
|
|||||||
Reference in New Issue
Block a user