update server app path to host's
This commit is contained in:
@@ -64,10 +64,14 @@ PASSWORD=change-this-default-admin-password
|
||||
# Docker image name for ACC server containers (built from docker/acc-server/Dockerfile)
|
||||
# ACC_IMAGE=acc-wine:latest
|
||||
|
||||
# Base path where per-server game installations are stored.
|
||||
# Base path where per-server game installations are stored (inside the manager container).
|
||||
# Each server gets its own subdirectory: ACC_SERVERS_PATH/<service-name>/
|
||||
# ACC_SERVERS_PATH=/data/servers
|
||||
|
||||
# Host-side path for the same directory — used when creating sibling ACC server containers.
|
||||
# Must match the host path bound to ACC_SERVERS_PATH in docker-compose.yml.
|
||||
# ACC_SERVERS_HOST_PATH=/opt/acc-servers
|
||||
|
||||
# Port pool for Docker-mode ACC server containers (one port per server).
|
||||
# PORT_POOL_MIN=9600
|
||||
# PORT_POOL_MAX=9700
|
||||
|
||||
@@ -16,17 +16,17 @@ services:
|
||||
PORT_POOL_MAX: "9700"
|
||||
ACC_IMAGE: acc-wine:latest
|
||||
ACC_SERVERS_PATH: /data/servers
|
||||
ACC_SERVERS_HOST_PATH: /opt/acc-servers
|
||||
env_file:
|
||||
- .env
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
- acc-servers:/data/servers
|
||||
- /opt/acc-servers:/data/servers
|
||||
- acc-db:/data/db
|
||||
networks:
|
||||
- acc-net
|
||||
|
||||
volumes:
|
||||
acc-servers:
|
||||
acc-db:
|
||||
|
||||
networks:
|
||||
|
||||
@@ -7,7 +7,9 @@ import (
|
||||
"acc-server-manager/local/utl/logging"
|
||||
"context"
|
||||
"fmt"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/docker/docker/api/types"
|
||||
"github.com/docker/docker/api/types/container"
|
||||
@@ -50,8 +52,13 @@ func (r *DockerRuntime) Create(ctx context.Context, server *model.Server) error
|
||||
natPortUDP: struct{}{},
|
||||
}
|
||||
|
||||
containerBase := env.GetACCServersPath()
|
||||
hostBase := env.GetACCServersHostPath()
|
||||
serverSubPath := strings.TrimPrefix(server.GetServerPath(), containerBase)
|
||||
hostServerPath := filepath.Join(hostBase, serverSubPath)
|
||||
|
||||
binds := []string{
|
||||
fmt.Sprintf("%s:/acc/game:rw", server.GetServerPath()),
|
||||
fmt.Sprintf("%s:/acc/game:rw", hostServerPath),
|
||||
}
|
||||
|
||||
resp, err := r.client.ContainerCreate(ctx, &container.Config{
|
||||
|
||||
@@ -487,9 +487,9 @@ func (s *ServerService) rollbackSteps(ctx context.Context, server *model.Server,
|
||||
case model.StepServiceCreation:
|
||||
s.runtime.Delete(ctx, server.ID)
|
||||
case model.StepSteamDownload:
|
||||
if !env.IsDockerPlatform() {
|
||||
s.steamService.UninstallServer(server.Path)
|
||||
}
|
||||
case model.StepDirectoryCreation:
|
||||
s.steamService.UninstallServer(server.Path)
|
||||
case model.StepConfigGeneration:
|
||||
if env.IsDockerPlatform() && server.Port > 0 {
|
||||
s.portPool.Release(ctx, server.Port)
|
||||
@@ -520,11 +520,9 @@ func (s *ServerService) DeleteServer(ctx *fiber.Ctx, serverID uuid.UUID) error {
|
||||
}
|
||||
}
|
||||
|
||||
if server.Platform != "docker" {
|
||||
if err := s.steamService.UninstallServer(server.Path); err != nil {
|
||||
logging.Error("Failed to uninstall server: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
if env.IsDockerPlatform() && server.Port > 0 {
|
||||
s.portPool.Release(ctx.UserContext(), server.Port)
|
||||
|
||||
7
local/utl/env/env.go
vendored
7
local/utl/env/env.go
vendored
@@ -65,6 +65,13 @@ func GetACCServersPath() string {
|
||||
return DefaultACCServersPath
|
||||
}
|
||||
|
||||
func GetACCServersHostPath() string {
|
||||
if p := os.Getenv("ACC_SERVERS_HOST_PATH"); p != "" {
|
||||
return p
|
||||
}
|
||||
return GetACCServersPath()
|
||||
}
|
||||
|
||||
func ValidatePaths() map[string]error {
|
||||
errors := make(map[string]error)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user