Fixed a problem with docker mounts always being read-write and not mounting properly into containers

This commit is contained in:
Frikky
2025-04-03 19:19:40 +02:00
parent d1d06df2b0
commit b204296e71
5 changed files with 69 additions and 25 deletions
+8
View File
@@ -3544,6 +3544,10 @@ func handleCloudJob(job shuffle.CloudSyncJob) error {
} }
backendPort := os.Getenv("BACKEND_PORT") backendPort := os.Getenv("BACKEND_PORT")
if backendPort == "" {
backendPort = "5001"
}
redirectDomain := fmt.Sprintf("localhost:%s", backendPort) redirectDomain := fmt.Sprintf("localhost:%s", backendPort)
redirectUrl := fmt.Sprintf("http://%s/api/v1/triggers/outlook/register", redirectDomain) redirectUrl := fmt.Sprintf("http://%s/api/v1/triggers/outlook/register", redirectDomain)
outlookClient, _, err := shuffle.GetOutlookClient(ctx, "", hook.OauthToken, redirectUrl) outlookClient, _, err := shuffle.GetOutlookClient(ctx, "", hook.OauthToken, redirectUrl)
@@ -4201,6 +4205,10 @@ func runInitEs(ctx context.Context) {
log.Printf("[INFO] Running schedule for cleaning up or re-running unfinished workflows in %d environments.", len(environments)) log.Printf("[INFO] Running schedule for cleaning up or re-running unfinished workflows in %d environments.", len(environments))
backendPort := os.Getenv("BACKEND_PORT") backendPort := os.Getenv("BACKEND_PORT")
if backendPort == "" {
backendPort = "5001"
}
for _, environment := range environments { for _, environment := range environments {
// Allowed without PROXY management as it's localhost // Allowed without PROXY management as it's localhost
// client := shuffle.GetExternalClient(syncUrl) // client := shuffle.GetExternalClient(syncUrl)
+2 -2
View File
@@ -2037,7 +2037,7 @@ const AppCreator = (defaultprops) => {
for (let actionkey in actions) { for (let actionkey in actions) {
var item = JSON.parse(JSON.stringify(actions[actionkey])) var item = JSON.parse(JSON.stringify(actions[actionkey]))
if (item.errors.length > 0) { if (item.errors.length > 0) {
toast("Saving with error in action " + item.name); //toast("Saving with error in action " + item.name);
} }
if (item.name === undefined && item.description !== undefined) { if (item.name === undefined && item.description !== undefined) {
@@ -3858,7 +3858,7 @@ const AppCreator = (defaultprops) => {
if (currentAction.url === "" && actions !== undefined && actions !== null && actions.length > 0) { if (currentAction.url === "" && actions !== undefined && actions !== null && actions.length > 0) {
for (var i = 0; i < actions.length; i++) { for (var i = 0; i < actions.length; i++) {
if (actions[i].name.toLowerCase() === e.target.value.toLowerCase()) { if (actions[i].name.toLowerCase() === e.target.value.toLowerCase()) {
toast("Action with name " + e.target.value + " already exists. If you keep this, it will be overwritten.") //toast("Action with name " + e.target.value + " already exists. If you keep this, it will be overwritten.")
break break
} }
} }
+1 -1
View File
@@ -4,7 +4,7 @@ go 1.23.0
toolchain go1.23.6 toolchain go1.23.6
//replace github.com/shuffle/shuffle-shared => ../../../../shuffle-shared replace github.com/shuffle/shuffle-shared => ../../../../shuffle-shared
require ( require (
github.com/docker/docker v27.5.0+incompatible github.com/docker/docker v27.5.0+incompatible
+12 -3
View File
@@ -744,6 +744,8 @@ func handleBackendImageDownload(ctx context.Context, images string) error {
handled := []string{} handled := []string{}
//log.Printf("[DEBUG] Removing existing image (s): %s", images) //log.Printf("[DEBUG] Removing existing image (s): %s", images)
newImages := []string{} newImages := []string{}
successful := []string{}
for _, curimage := range strings.Split(images, ",") { for _, curimage := range strings.Split(images, ",") {
curimage = strings.TrimSpace(curimage) curimage = strings.TrimSpace(curimage)
if shuffle.ArrayContains(handled, curimage) { if shuffle.ArrayContains(handled, curimage) {
@@ -775,12 +777,19 @@ func handleBackendImageDownload(ctx context.Context, images string) error {
err := shuffle.DownloadDockerImageBackend(&http.Client{Timeout: imagedownloadTimeout}, curimage) err := shuffle.DownloadDockerImageBackend(&http.Client{Timeout: imagedownloadTimeout}, curimage)
if err != nil { if err != nil {
log.Printf("[ERROR] Failed downloading image: %s", err) //log.Printf("[ERROR] Failed downloading image: %s", err)
} else { } else {
log.Printf("[DEBUG] Downloaded image: %s", curimage) //log.Printf("[DEBUG] Downloaded image: %s", curimage)
successful = append(successful, curimage)
} }
} }
if len(successful) == 0 {
log.Printf("[ERROR] Failed downloading image copies: %s. This means the app may not have been updated.", strings.Join(handled, ", "))
} else {
log.Printf("[DEBUG] Successfully downloaded image copies: %s", strings.Join(successful, ", "))
}
if swarmConfig == "run" || swarmConfig == "swarm" { if swarmConfig == "run" || swarmConfig == "swarm" {
log.Printf("[DEBUG] Should update service with new image after updating(s): %s. \n\nBETA REPLACEMENT IMPLEMENTATION: Contact support@shuffler.io for support.", strings.Join(newImages, "\n")) log.Printf("[DEBUG] Should update service with new image after updating(s): %s. \n\nBETA REPLACEMENT IMPLEMENTATION: Contact support@shuffler.io for support.", strings.Join(newImages, "\n"))
@@ -1919,7 +1928,7 @@ func main() {
} }
// Handle Cleanup - made it cleanup by default // Handle Cleanup - made it cleanup by default
if strings.ToLower(os.Getenv("SHUFFLE_CONTAINER_AUTO_CLEANUP")) != "false" { if strings.ToLower(os.Getenv("SHUFFLE_CONTAINER_AUTO_CLEANUP")) != "false" && os.Getenv("CLEANUP") == "" {
cleanupEnv = "true" cleanupEnv = "true"
} }
+46 -19
View File
@@ -894,19 +894,27 @@ func deployApp(cli *dockerclient.Client, image string, identifier string, env []
if len(volumeBindString) > 0 { if len(volumeBindString) > 0 {
volumeBindSplit := strings.Split(volumeBindString, ",") volumeBindSplit := strings.Split(volumeBindString, ",")
for _, volumeBind := range volumeBindSplit { for _, volumeBind := range volumeBindSplit {
if strings.Contains(volumeBind, ":") { if volumeBind == "srcfolder=dstfolder" || volumeBind == "srcfolder:dstfolder" || volumeBind == "/srcfolder:/dstfolder" {
volumeBinds = append(volumeBinds, volumeBind) log.Printf("[DEBUG] Volume bind '%s' is invalid and is used for visualization.", volumeBind)
} else { continue
log.Printf("[ERROR] Volume bind '%s' is invalid.", volumeBind)
} }
if !strings.HasPrefix(volumeBind, "/") {
log.Printf("[ERROR] Volume bind '%s' is invalid. Use absolute paths.", volumeBind)
continue
}
if !strings.Contains(volumeBind, ":") {
log.Printf("[ERROR] Volume bind '%s' is invalid. Use absolute paths with colon inbetween them (/srcpath:dstpath/", volumeBind)
continue
}
volumeBinds = append(volumeBinds, volumeBind)
} }
} }
// Add more volume binds if possible // Add more volume binds if possible
if len(volumeBinds) > 0 { if len(volumeBinds) > 0 {
log.Printf("[DEBUG] Setting up binds for container. Got %d volume binds.", len(volumeBinds))
//hostConfig.Binds = volumeBinds
// Only use mounts, not direct binds // Only use mounts, not direct binds
hostConfig.Binds = []string{} hostConfig.Binds = []string{}
@@ -917,15 +925,27 @@ func deployApp(cli *dockerclient.Client, image string, identifier string, env []
continue continue
} }
log.Printf("[DEBUG] Appending bind %s to app container", bind) log.Printf("[DEBUG] Appending bind %s to App container", bind)
bindSplit := strings.Split(bind, ":") bindSplit := strings.Split(bind, ":")
sourceFolder := bindSplit[0] sourceFolder := bindSplit[0]
destinationFolder := bindSplit[1] destinationFolder := bindSplit[1]
hostConfig.Mounts = append(hostConfig.Mounts, mount.Mount{
readOnly := false
if len(bindSplit) > 2 {
mode := bindSplit[2]
if mode == "ro" {
readOnly = true
}
}
builtMount := mount.Mount{
Type: mount.TypeBind, Type: mount.TypeBind,
Source: sourceFolder, Source: sourceFolder,
Target: destinationFolder, Target: destinationFolder,
}) ReadOnly: readOnly,
}
hostConfig.Mounts = append(hostConfig.Mounts, builtMount)
} }
} }
@@ -1053,17 +1073,24 @@ func DeployContainer(ctx context.Context, cli *dockerclient.Client, config *cont
err = cli.ContainerStart(ctx, cont.ID, container.StartOptions{}) err = cli.ContainerStart(ctx, cont.ID, container.StartOptions{})
if err != nil { if err != nil {
if strings.Contains(fmt.Sprintf("%s", err), "cannot join network") || strings.Contains(fmt.Sprintf("%s", err), "No such container") { if strings.Contains(fmt.Sprintf("%s", err), "cannot join network") || strings.Contains(fmt.Sprintf("%s", err), "No such container") {
// Remove the "CREATED" one from the previous:
removeErr := cli.ContainerRemove(ctx, cont.ID, container.RemoveOptions{})
if removeErr != nil {
log.Printf("[ERROR] Failed to remove container %s: %s", cont.ID, removeErr)
}
log.Printf("[WARNING] Failed deploying App on first attempt: %s. Removing some HostConfig configs.", err)
parsedUuid := uuid.NewV4() parsedUuid := uuid.NewV4()
identifier = fmt.Sprintf("%s-%s-nonetwork", identifier, parsedUuid) identifier = fmt.Sprintf("%s-%s-nonetwork", identifier, parsedUuid)
hostConfig = &container.HostConfig{
LogConfig: container.LogConfig{ hostConfig.NetworkMode = container.NetworkMode("")
Type: "json-file", hostConfig.LogConfig = container.LogConfig{
Config: map[string]string{ Type: "json-file",
"max-size": "10m", Config: map[string]string{
}, "max-size": "10m",
}, },
Resources: container.Resources{},
} }
hostConfig.Resources = container.Resources{}
cont, err = cli.ContainerCreate( cont, err = cli.ContainerCreate(
context.Background(), context.Background(),
@@ -1085,12 +1112,12 @@ func DeployContainer(ctx context.Context, cli *dockerclient.Client, config *cont
return err return err
} }
log.Printf("[DEBUG] Running secondary check without network with worker") //log.Printf("[DEBUG] Running secondary check without network with worker")
err = cli.ContainerStart(ctx, cont.ID, container.StartOptions{}) err = cli.ContainerStart(ctx, cont.ID, container.StartOptions{})
} }
if err != nil { if err != nil {
log.Printf("[ERROR] Failed to start container in environment %s: %s", environment, err) log.Printf("[ERROR] Failed to start container (2) in runtime location %s: %s", environment, err)
cacheErr := shuffle.DeleteCache(ctx, actionExecId) cacheErr := shuffle.DeleteCache(ctx, actionExecId)
if cacheErr != nil { if cacheErr != nil {