Invario/Inventarsystem
3
1
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 392 Wiki Activity

fix(tenant-manager): use absolute host paths for docker compose mount resolution

Browse Source
This commit is contained in:
AIIrondev
2026-05-08 21:13:44 +02:00
parent 6079f5bc3e
commit 982efa9efe
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
manage-tenant.sh
+5 -3
View File
@@ -175,14 +175,16 @@ EOF
restart_app_container() { restart_app_container() {
local env_file="$PWD/.docker-build.env" local env_file="$PWD/.docker-build.env"
local compose_args=( -f "$PWD/docker-compose-multitenant.yml" ) # If HOST_WORKDIR is set, use it for absolute paths so docker daemon sees correct host paths
local work_base="${HOST_WORKDIR:-.}"
local compose_args=( -f "$work_base/docker-compose-multitenant.yml" )
# Pass along COMPOSE_PROJECT_NAME if set so the internal docker-compose sees it # Pass along COMPOSE_PROJECT_NAME if set so the internal docker-compose sees it
if [ -n "$COMPOSE_PROJECT_NAME" ]; then if [ -n "$COMPOSE_PROJECT_NAME" ]; then
compose_args=( -p "$COMPOSE_PROJECT_NAME" "${compose_args[@]}" ) compose_args=( -p "$COMPOSE_PROJECT_NAME" "${compose_args[@]}" )
fi fi
if [ -f "$PWD/.docker-compose.runtime.override.yml" ]; then if [ -f "$work_base/.docker-compose.runtime.override.yml" ]; then
compose_args+=( -f "$PWD/.docker-compose.runtime.override.yml" ) compose_args+=( -f "$work_base/.docker-compose.runtime.override.yml" )
fi fi
if [ -f "$env_file" ]; then if [ -f "$env_file" ]; then
compose_args+=( --env-file "$env_file" ) compose_args+=( --env-file "$env_file" )
run-tenant-cmd.sh
+2 -1
View File
@@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
# Wrapper to run tenant management fully containerized via docker-compose # Wrapper to run tenant management fully containerized via docker-compose
PROJECT_NAME=${COMPOSE_PROJECT_NAME:-$(basename "$PWD" | tr '[:upper:]' '[:lower:]')} PROJECT_NAME=${COMPOSE_PROJECT_NAME:-$(basename "$PWD" | tr '[:upper:]' '[:lower:]')}
docker compose -f docker-compose-multitenant.yml --profile tools run --rm -e COMPOSE_PROJECT_NAME="$PROJECT_NAME" tenant-manager "$@" # Pass the absolute working directory to the container so docker compose can resolve paths correctly
docker compose -f docker-compose-multitenant.yml --profile tools run --rm -e COMPOSE_PROJECT_NAME="$PROJECT_NAME" -e HOST_WORKDIR="$PWD" tenant-manager "$@"