secrets processibg chanbged

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