From 689819df08ff4a68115435b1a62ba56af6a5c38a Mon Sep 17 00:00:00 2001 From: AIIrondev Date: Tue, 12 May 2026 08:16:04 +0200 Subject: [PATCH] feat: update application image version and enhance docker-compose configuration --- .docker-build.env | 2 +- .release-version | 1 + backup.sh | 0 docker-compose.yml | 72 ++++++++++++++++++++++++++++++---------------- 4 files changed, 49 insertions(+), 26 deletions(-) create mode 100644 .release-version mode change 100644 => 100755 backup.sh diff --git a/.docker-build.env b/.docker-build.env index 25dccc4..f26626b 100644 --- a/.docker-build.env +++ b/.docker-build.env @@ -1,7 +1,7 @@ NUITKA_BUILD=0 INVENTAR_HTTP_PORT=10000 INVENTAR_HTTP_PORTS=10000 -INVENTAR_APP_IMAGE=ghcr.io/aiirondev/legendary-octo-garbanzo:latest +INVENTAR_APP_IMAGE=ghcr.io/aiirondev/legendary-octo-garbanzo:v0.7.39 INVENTAR_APP_CPUS=1.0 INVENTAR_APP_MEM_LIMIT=384m INVENTAR_APP_MEM_SWAP_LIMIT=768m diff --git a/.release-version b/.release-version new file mode 100644 index 0000000..c69907b --- /dev/null +++ b/.release-version @@ -0,0 +1 @@ +v0.7.42 diff --git a/backup.sh b/backup.sh old mode 100644 new mode 100755 diff --git a/docker-compose.yml b/docker-compose.yml index 0be9234..02ae488 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,41 +1,63 @@ -version: "3.8" - services: app: - build: . - container_name: inventory-app + image: ghcr.io/aiirondev/legendary-octo-garbanzo:v0.7.39 + container_name: inventarsystem-app restart: unless-stopped - environment: - - MONGO_URL=mongodb://mongodb:27017/inventar - - REDIS_URL=redis://redis:6379 - - BASE_URL=https://inventar.maximiliangruendinger.de #alle öffentliche subdomains + ports: + - "10000:8000" depends_on: - mongodb - redis + environment: + INVENTAR_MONGODB_HOST: mongodb + INVENTAR_MONGODB_PORT: "27017" + INVENTAR_MONGODB_DB: Inventarsystem + INVENTAR_BACKUP_FOLDER: /data/backups + INVENTAR_LOGS_FOLDER: /data/logs + expose: + - "8000" + volumes: + - ./config.json:/app/config.json:ro + - app_uploads:/app/Web/uploads + - app_thumbnails:/app/Web/thumbnails + - app_previews:/app/Web/previews + - app_qrcodes:/app/Web/QRCodes + - app_backups:/data/backups + - app_logs:/data/logs mongodb: - image: mongo:latest - container_name: mongodb + image: mongo:7.0 + container_name: inventarsystem-mongodb restart: unless-stopped volumes: - - mongo_data:/data/db + - mongodb_data:/data/db + healthcheck: + test: ["CMD", "mongosh", "--quiet", "--eval", "db.adminCommand('ping').ok"] + interval: 10s + timeout: 5s + retries: 10 redis: - image: redis:alpine - container_name: redis + image: redis:7-alpine + container_name: inventarsystem-redis restart: unless-stopped - - cloudflared: - image: cloudflare/cloudflared:latest - container_name: cloudflared - restart: unless-stopped - # Der Tunnel-Name 'homeserver' muss zu deiner credentials.json passen - command: tunnel run homeserver + command: redis-server --appendonly yes --maxmemory 512mb --maxmemory-policy allkeys-lru + ports: + - "6379:6379" volumes: - - ./config.yml:/etc/cloudflared/config.yml - - ./credentials.json:/etc/cloudflared/credentials.json - depends_on: - - app + - redis_data:/data + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 10s + timeout: 5s + retries: 5 volumes: - mongo_data: \ No newline at end of file + mongodb_data: + app_uploads: + app_thumbnails: + app_previews: + app_qrcodes: + app_backups: + app_logs: + redis_data: