secrets processibg chanbged

This commit is contained in:
2026-09-16 15:02:00 +02:00
parent 7ab2899e92
commit 8673c0f05c
+100 -92
View File
@@ -230,98 +230,106 @@ jobs:
tags: | tags: |
${{ steps.meta.outputs.image }} ${{ steps.meta.outputs.image }}
- name: Create release-only docker bundle - name: Create release-only docker bundle
run: | run: |
mkdir -p release-bundle mkdir -p release-bundle
cat > release-bundle/docker-compose.yml <<EOF
services: # 1. .env Datei aus Gitea Secrets erzeugen
app: cat > release-bundle/.env <<EOF
image: \${INVENTAR_APP_IMAGE:-${{ steps.meta.outputs.image }}} INVENTAR_SECRET_KEY=${{ secrets.INVENTAR_SECRET_KEY }}
container_name: inventarsystem-app INVENTAR_DATA_ENCRYPTION_KEY=${{ secrets.INVENTAR_DATA_ENCRYPTION_KEY }}
restart: unless-stopped INVENTAR_MONGODB_PASSWORD=${{ secrets.INVENTAR_MONGODB_PASSWORD }}
ports: EMAIL_ENABLED=${{ secrets.EMAIL_ENABLED }}
- "\${INVENTAR_HTTP_PORT:-10000}:8000" EMAIL_SMTP_HOST=${{ secrets.EMAIL_SMTP_HOST }}
depends_on: EMAIL_SMTP_PORT=${{ secrets.EMAIL_SMTP_PORT }}
- mongodb EMAIL_USERNAME=${{ secrets.EMAIL_USERNAME }}
- redis EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }}
environment: EMAIL_FROM_ADDRESS=${{ secrets.EMAIL_FROM_ADDRESS }}
INVENTAR_MONGODB_HOST: mongodb EOF
INVENTAR_MONGODB_PORT: "27017"
INVENTAR_MONGODB_DB: Inventarsystem # 2. docker-compose.yml nutzt env_file
INVENTAR_BACKUP_FOLDER: /data/backups cat > release-bundle/docker-compose.yml <<EOF
INVENTAR_LOGS_FOLDER: /data/logs services:
INVENTAR_SECRET_KEY: ${{ secrets.INVENTAR_SECRET_KEY }} app:
INVENTAR_DATA_ENCRYPTION_KEY: ${{ secrets.INVENTAR_DATA_ENCRYPTION_KEY }} image: \${INVENTAR_APP_IMAGE:-${{ steps.meta.outputs.image }}}
INVENTAR_MONGODB_PASSWORD: ${{ secrets.INVENTAR_MONGODB_PASSWORD }} container_name: inventarsystem-app
EMAIL_ENABLED: ${{ secrets.EMAIL_ENABLED }} restart: unless-stopped
EMAIL_SMTP_HOST: mai.invario-software.de env_file:
EMAIL_SMTP_PORT: 587 - .env
EMAIL_USERNAME: no-reply@invario-software.de ports:
EMAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }} - "\${INVENTAR_HTTP_PORT:-10000}:8000"
EMAIL_FROM_ADDRESS: ${{ secrets.EMAIL_FROM_ADDRESS }} depends_on:
expose: - mongodb
- "8000" - redis
volumes: environment:
- ./config.json:/app/config.json:ro INVENTAR_MONGODB_HOST: mongodb
- app_uploads:/app/Web/uploads INVENTAR_MONGODB_PORT: "27017"
- app_thumbnails:/app/Web/thumbnails INVENTAR_MONGODB_DB: Inventarsystem
- app_previews:/app/Web/previews INVENTAR_BACKUP_FOLDER: /data/backups
- app_qrcodes:/app/Web/QRCodes INVENTAR_LOGS_FOLDER: /data/logs
- app_backups:/data/backups expose:
- app_logs:/data/logs - "8000"
volumes:
mongodb: - ./config.json:/app/config.json:ro
image: mongo:7.0 - app_uploads:/app/Web/uploads
container_name: inventarsystem-mongodb - app_thumbnails:/app/Web/thumbnails
restart: unless-stopped - app_previews:/app/Web/previews
volumes: - app_qrcodes:/app/Web/QRCodes
- mongodb_data:/data/db - app_backups:/data/backups
healthcheck: - app_logs:/data/logs
test: ["CMD", "mongosh", "--quiet", "--eval", "db.adminCommand('ping').ok"]
interval: 10s mongodb:
timeout: 5s image: mongo:7.0
retries: 10 container_name: inventarsystem-mongodb
restart: unless-stopped
redis: volumes:
image: redis:7-alpine - mongodb_data:/data/db
container_name: inventarsystem-redis healthcheck:
restart: unless-stopped test: ["CMD", "mongosh", "--quiet", "--eval", "db.adminCommand('ping').ok"]
command: redis-server --appendonly yes --maxmemory 512mb --maxmemory-policy allkeys-lru interval: 10s
ports: timeout: 5s
- "6379:6379" retries: 10
volumes:
- redis_data:/data redis:
healthcheck: image: redis:7-alpine
test: ["CMD", "redis-cli", "ping"] container_name: inventarsystem-redis
interval: 10s restart: unless-stopped
timeout: 5s command: redis-server --appendonly yes --maxmemory 512mb --maxmemory-policy allkeys-lru
retries: 5 ports:
- "6379:6379"
volumes: volumes:
mongodb_data: - redis_data:/data
app_uploads: healthcheck:
app_thumbnails: test: ["CMD", "redis-cli", "ping"]
app_previews: interval: 10s
app_qrcodes: timeout: 5s
app_backups: retries: 5
app_logs:
redis_data: volumes:
EOF mongodb_data:
app_uploads:
for f in start.sh stop.sh restart.sh backup.sh restore.sh config.json update.sh; do app_thumbnails:
if [ -f "$f" ]; then app_previews:
cp "$f" "release-bundle/$(basename "$f")" app_qrcodes:
fi app_backups:
done app_logs:
redis_data:
for f in docker-compose-multitenant.yml manage-tenant.sh run-tenant-cmd.sh MULTITENANT_DEPLOYMENT.md MULTITENANT_PYTHON_API.md; do EOF
if [ -f "$f" ]; then
cp "$f" "release-bundle/$(basename "$f")" for f in start.sh stop.sh restart.sh backup.sh restore.sh config.json update.sh; do
fi if [ -f "$f" ]; then
done cp "$f" "release-bundle/$(basename "$f")"
fi
find release-bundle -maxdepth 1 -type f -name '*.sh' -exec chmod +x {} \; || true done
tar -czf inventarsystem-docker-bundle.tar.gz -C release-bundle .
for f in docker-compose-multitenant.yml manage-tenant.sh run-tenant-cmd.sh MULTITENANT_DEPLOYMENT.md MULTITENANT_PYTHON_API.md; do
if [ -f "$f" ]; then
cp "$f" "release-bundle/$(basename "$f")"
fi
done
find release-bundle -maxdepth 1 -type f -name '*.sh' -exec chmod +x {} \; || true
tar -czf inventarsystem-docker-bundle.tar.gz -C release-bundle .
- name: Create or update Gitea Release - name: Create or update Gitea Release
uses: https://gitea.com/actions/gitea-release-action@v1 uses: https://gitea.com/actions/gitea-release-action@v1