Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1b1acff6b2 | |||
| 5d44c15a4e | |||
| 8d29f2d925 | |||
| 982efa9efe | |||
| 6079f5bc3e | |||
| 629ac13a25 | |||
| 2b582c8700 | |||
| fd55fa9703 |
+24
-1
@@ -192,6 +192,24 @@
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
#loginNavbar .navbar-brand {
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
#loginNavbar .navbar-brand::before {
|
||||
content: none;
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
#loginNavbar .invario-logo {
|
||||
display: block;
|
||||
height: 48px;
|
||||
width: auto;
|
||||
max-width: min(58vw, 280px);
|
||||
object-fit: contain;
|
||||
filter: drop-shadow(0 0 2px rgba(255, 255, 255, 0.45));
|
||||
}
|
||||
|
||||
.navbar-text.tenant-badge {
|
||||
font-size: 0.82rem;
|
||||
color: rgba(255,255,255,0.9);
|
||||
@@ -337,6 +355,11 @@
|
||||
font-size: 0.75rem;
|
||||
padding: 0.4rem 0.5rem;
|
||||
}
|
||||
|
||||
#loginNavbar .invario-logo {
|
||||
height: 34px;
|
||||
max-width: 62vw;
|
||||
}
|
||||
}
|
||||
|
||||
.navbar.nav-compact .navbar-brand {
|
||||
@@ -1269,7 +1292,7 @@
|
||||
<nav class="navbar navbar-expand-lg navbar-dark" id="loginNavbar">
|
||||
<div class="container-fluid">
|
||||
<a class="navbar-brand py-0" href="{{ url_for('home') }}">
|
||||
<img src="{{ url_for('static', filename='img/invario-logo.png') }}" alt="Invario" height="40" class="d-inline-block align-top" style="filter: drop-shadow(0px 0px 2px rgba(255,255,255,0.5));">
|
||||
<img src="{{ url_for('static', filename='img/invario-logo.png') }}" alt="Invario" class="invario-logo">
|
||||
</a>
|
||||
<ul class="navbar-nav ms-auto mb-2 mb-lg-0">
|
||||
<li class="nav-item">
|
||||
|
||||
+24
-6
@@ -175,13 +175,31 @@ EOF
|
||||
|
||||
restart_app_container() {
|
||||
local env_file="$PWD/.docker-build.env"
|
||||
local compose_args=( -f "$PWD/docker-compose-multitenant.yml" )
|
||||
|
||||
if [ -f "$PWD/.docker-compose.runtime.override.yml" ]; then
|
||||
compose_args+=( -f "$PWD/.docker-compose.runtime.override.yml" )
|
||||
local compose_args=()
|
||||
|
||||
# If HOST_WORKDIR is set (called from container), use absolute paths so docker daemon resolves them correctly
|
||||
if [ -n "$HOST_WORKDIR" ]; then
|
||||
compose_args+=( -f "$(readlink -f "$HOST_WORKDIR/docker-compose-multitenant.yml")" )
|
||||
if [ -f "$HOST_WORKDIR/.docker-compose.runtime.override.yml" ]; then
|
||||
compose_args+=( -f "$(readlink -f "$HOST_WORKDIR/.docker-compose.runtime.override.yml")" )
|
||||
fi
|
||||
if [ -f "$HOST_WORKDIR/.docker-build.env" ]; then
|
||||
compose_args+=( --env-file "$(readlink -f "$HOST_WORKDIR/.docker-build.env")" )
|
||||
fi
|
||||
else
|
||||
# Normal case: called directly from host
|
||||
compose_args+=( -f "$PWD/docker-compose-multitenant.yml" )
|
||||
if [ -f "$PWD/.docker-compose.runtime.override.yml" ]; then
|
||||
compose_args+=( -f "$PWD/.docker-compose.runtime.override.yml" )
|
||||
fi
|
||||
if [ -f "$env_file" ]; then
|
||||
compose_args+=( --env-file "$env_file" )
|
||||
fi
|
||||
fi
|
||||
if [ -f "$env_file" ]; then
|
||||
compose_args+=( --env-file "$env_file" )
|
||||
|
||||
# Pass along COMPOSE_PROJECT_NAME if set so the internal docker-compose sees it
|
||||
if [ -n "$COMPOSE_PROJECT_NAME" ]; then
|
||||
compose_args=( -p "$COMPOSE_PROJECT_NAME" "${compose_args[@]}" )
|
||||
fi
|
||||
|
||||
echo "Restarting app container to apply tenant configuration changes..."
|
||||
|
||||
+2
-1
@@ -1,4 +1,5 @@
|
||||
#!/bin/bash
|
||||
# Wrapper to run tenant management fully containerized via docker-compose
|
||||
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 "$@"
|
||||
|
||||
Reference in New Issue
Block a user