Fix mount shenanigans

Author: nickheyer

docker-compose.yml

@@ -29,10 +29,9 @@ services:
       # DISCOPANEL_DATA_DIR=/app/data
       # DISCOPANEL_HOST_DATA_PATH=/home/user/data
       # (See environment)
-      - /home/user/data:/app/data
-
-      - ./backups:/app/backups
-      - ./tmp:/app/tmp
+      - /opt/discopanel/data:/app/data
+      - /opt/discopanel/backups:/app/backups
+      - /tmp/discopanel:/app/tmp
 
       # Configuration file, uncomment if you are using a config file (optional, see config.example.yaml for all available options).
       #- ./config.yaml:/app/config.yaml:ro

internal/docker/client.go

@@ -440,7 +440,7 @@ func (c *Client) CreateContainer(ctx context.Context, server *models.Server, ser
 	hostConfig := &container.HostConfig{
 		PortBindings: portBindings,
 		Mounts: []mount.Mount{
-			{Type: mount.TypeBind, Source: dataPath, Target: "/data"},
+			{Type: mount.TypeBind, Source: dataPath, Target: "/data", BindOptions: &mount.BindOptions{CreateMountpoint: true}},
 		},
 		RestartPolicy: container.RestartPolicy{Name: "unless-stopped"},
 		Resources: container.Resources{

internal/docker/module.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"os"
-	"path/filepath"
 
 	shellparse "github.com/arkady-emelyanov/go-shellparse"
 	"github.com/docker/docker/api/types/container"
@@ -225,31 +223,12 @@ func (c *Client) parseVolumeMounts(volumeJSON string, aliasCtx *alias.Context) [
 			continue
 		}
 
-		// Handle path translation when DiscoPanel runs in a container
-		if mountType == mount.TypeBind {
-			if envHostDataPath := os.Getenv("DISCOPANEL_HOST_DATA_PATH"); envHostDataPath != "" {
-				containerDataDir := os.Getenv("DISCOPANEL_DATA_DIR")
-				if containerDataDir == "" {
-					containerDataDir = "/app/data"
-				}
-				if relPath, err := filepath.Rel(containerDataDir, source); err == nil {
-					source = filepath.Join(envHostDataPath, relPath)
-				}
-			}
-		}
-
-		// Ensure source directory exists for bind mounts
-		if mountType == mount.TypeBind {
-			if err := os.MkdirAll(source, 0755); err != nil {
-				c.log.Warn("Failed to create volume source directory %s: %v", source, err)
-			}
-		}
-
 		mounts = append(mounts, mount.Mount{
-			Type:     mountType,
-			Source:   source,
-			Target:   target,
-			ReadOnly: vol.ReadOnly,
+			Type:        mountType,
+			Source:      source,
+			Target:      target,
+			ReadOnly:    vol.ReadOnly,
+			BindOptions: &mount.BindOptions{CreateMountpoint: true},
 		})
 	}