Removed a problem with duplicate binds in worker
This commit is contained in:
@@ -4,7 +4,7 @@ go 1.23.0
|
|||||||
|
|
||||||
toolchain go1.23.7
|
toolchain go1.23.7
|
||||||
|
|
||||||
//replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
|
replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
|
||||||
|
|
||||||
require (
|
require (
|
||||||
cloud.google.com/go/datastore v1.15.0
|
cloud.google.com/go/datastore v1.15.0
|
||||||
|
|||||||
@@ -323,9 +323,17 @@ const LoginPage = props => {
|
|||||||
|
|
||||||
if (document !== undefined) {
|
if (document !== undefined) {
|
||||||
if (register) {
|
if (register) {
|
||||||
document.title = "Login to Shuffle SaaS"
|
if (isCloud) {
|
||||||
|
document.title = "Login to Shuffle SaaS"
|
||||||
|
} else {
|
||||||
|
document.title = "Login to Shuffle"
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
document.title = "Register to Shuffle SaaS"
|
if (isCloud) {
|
||||||
|
document.title = "Register to Shuffle SaaS"
|
||||||
|
} else {
|
||||||
|
document.title = "Register to Shuffle"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1260,18 +1260,17 @@ 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
|
// This is just to test the mounting locally so
|
||||||
// I can control from what source I'm mounting
|
// I can control from what source I'm mounting
|
||||||
// the certs to. Default behaviour is:
|
// the certs to. Default behaviour is:
|
||||||
// /certs:/certs.
|
// /certs:/certs.
|
||||||
|
certPath := "/certs"
|
||||||
if os.Getenv("SHUFFLE_CERT_PATH") != "" {
|
if os.Getenv("SHUFFLE_CERT_PATH") != "" {
|
||||||
certPath = os.Getenv("SHUFFLE_CERT_PATH")
|
certPath = os.Getenv("SHUFFLE_CERT_PATH")
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err := os.ReadDir(certPath)
|
_, err := os.ReadDir(certPath)
|
||||||
|
|
||||||
if certPath != "" && err == nil {
|
if certPath != "" && err == nil {
|
||||||
certVol := mount.Mount{
|
certVol := mount.Mount{
|
||||||
Type: mount.TypeBind,
|
Type: mount.TypeBind,
|
||||||
@@ -2477,7 +2476,7 @@ func main() {
|
|||||||
|
|
||||||
// Look for volume binds
|
// Look for volume binds
|
||||||
if len(os.Getenv("SHUFFLE_VOLUME_BINDS")) > 0 {
|
if len(os.Getenv("SHUFFLE_VOLUME_BINDS")) > 0 {
|
||||||
log.Printf("[DEBUG] Added volume binds: %s", os.Getenv("SHUFFLE_VOLUME_BINDS"))
|
//log.Printf("[DEBUG] Added volume binds: %s", os.Getenv("SHUFFLE_VOLUME_BINDS"))
|
||||||
env = append(env, fmt.Sprintf("SHUFFLE_VOLUME_BINDS=%s", os.Getenv("SHUFFLE_VOLUME_BINDS")))
|
env = append(env, fmt.Sprintf("SHUFFLE_VOLUME_BINDS=%s", os.Getenv("SHUFFLE_VOLUME_BINDS")))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -906,7 +906,10 @@ func deployApp(cli *dockerclient.Client, image string, identifier string, env []
|
|||||||
if len(volumeBinds) > 0 {
|
if len(volumeBinds) > 0 {
|
||||||
log.Printf("[DEBUG] Setting up binds for container. Got %d volume binds.", len(volumeBinds))
|
log.Printf("[DEBUG] Setting up binds for container. Got %d volume binds.", len(volumeBinds))
|
||||||
|
|
||||||
hostConfig.Binds = volumeBinds
|
//hostConfig.Binds = volumeBinds
|
||||||
|
|
||||||
|
// Only use mounts, not direct binds
|
||||||
|
hostConfig.Binds = []string{}
|
||||||
hostConfig.Mounts = []mount.Mount{}
|
hostConfig.Mounts = []mount.Mount{}
|
||||||
for _, bind := range volumeBinds {
|
for _, bind := range volumeBinds {
|
||||||
if !strings.Contains(bind, ":") || strings.Contains(bind, "..") || strings.HasPrefix(bind, "~") {
|
if !strings.Contains(bind, ":") || strings.Contains(bind, "..") || strings.HasPrefix(bind, "~") {
|
||||||
|
|||||||
Reference in New Issue
Block a user