Compare commits

..

7 Commits

5 changed files with 10 additions and 3 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 273 KiB

+3 -1
View File
@@ -1268,7 +1268,9 @@
{% else %} {% else %}
<nav class="navbar navbar-expand-lg navbar-dark" id="loginNavbar"> <nav class="navbar navbar-expand-lg navbar-dark" id="loginNavbar">
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand" href="{{ url_for('home') }}" data-icon="🔹">Invario</a> <a class="navbar-brand py-0" href="{{ url_for('home') }}">
<img src="{{ url_for('static', filename='img/invario-logo.png') }}" alt="Invario" height="120" class="d-inline-block align-top" style="filter: drop-shadow(0px 0px 2px rgba(255,255,255,0.5));">
</a>
<ul class="navbar-nav ms-auto mb-2 mb-lg-0"> <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{ url_for('impressum') }}">Impressum</a> <a class="nav-link" href="{{ url_for('impressum') }}">Impressum</a>
+1 -1
View File
@@ -20,7 +20,7 @@ services:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- .:/workspace - .:/workspace
entrypoint: > entrypoint: >
sh -c "apk add --no-cache bash docker-cli && cd /workspace && ./manage-tenant.sh \"$$@\"" -- sh -c "apk add --no-cache bash docker-cli docker-cli-compose && cd /workspace && ./manage-tenant.sh \"$$@\"" --
redis: redis:
image: redis:7-alpine image: redis:7-alpine
+4
View File
@@ -176,6 +176,10 @@ 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" ) local compose_args=( -f "$PWD/docker-compose-multitenant.yml" )
# 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
if [ -f "$PWD/.docker-compose.runtime.override.yml" ]; then if [ -f "$PWD/.docker-compose.runtime.override.yml" ]; then
compose_args+=( -f "$PWD/.docker-compose.runtime.override.yml" ) compose_args+=( -f "$PWD/.docker-compose.runtime.override.yml" )
+2 -1
View File
@@ -1,3 +1,4 @@
#!/bin/bash #!/bin/bash
# Wrapper to run tenant management fully containerized via docker-compose # Wrapper to run tenant management fully containerized via docker-compose
docker compose -f docker-compose-multitenant.yml --profile tools run --rm tenant-manager "$@" 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 "$@"