Invario/Inventarsystem
3
1
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 392 Wiki Activity

revert 8673c0f05c

Browse Source 
revert secrets processibg chanbged
This commit is contained in:
Aiirondev
2026-09-16 15:35:55 +00:00
parent 612ce2e6e6
commit 6589b8d275
1 changed files with 92 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/release-docker.yml
+92 -100
View File
@@ -230,106 +230,98 @@ 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
# 1. .env Datei aus Gitea Secrets erzeugen services:
cat > release-bundle/.env <<EOF app:
INVENTAR_SECRET_KEY=${{ secrets.INVENTAR_SECRET_KEY }} image: \${INVENTAR_APP_IMAGE:-${{ steps.meta.outputs.image }}}
INVENTAR_DATA_ENCRYPTION_KEY=${{ secrets.INVENTAR_DATA_ENCRYPTION_KEY }} container_name: inventarsystem-app
INVENTAR_MONGODB_PASSWORD=${{ secrets.INVENTAR_MONGODB_PASSWORD }} restart: unless-stopped
EMAIL_ENABLED=${{ secrets.EMAIL_ENABLED }} ports:
EMAIL_SMTP_HOST=${{ secrets.EMAIL_SMTP_HOST }} - "\${INVENTAR_HTTP_PORT:-10000}:8000"
EMAIL_SMTP_PORT=${{ secrets.EMAIL_SMTP_PORT }} depends_on:
EMAIL_USERNAME=${{ secrets.EMAIL_USERNAME }} - mongodb
EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }} - redis
EMAIL_FROM_ADDRESS=${{ secrets.EMAIL_FROM_ADDRESS }} environment:
EOF INVENTAR_MONGODB_HOST: mongodb
INVENTAR_MONGODB_PORT: "27017"
# 2. docker-compose.yml nutzt env_file INVENTAR_MONGODB_DB: Inventarsystem
cat > release-bundle/docker-compose.yml <<EOF INVENTAR_BACKUP_FOLDER: /data/backups
services: INVENTAR_LOGS_FOLDER: /data/logs
app: INVENTAR_SECRET_KEY: ${{ secrets.INVENTAR_SECRET_KEY }}
image: \${INVENTAR_APP_IMAGE:-${{ steps.meta.outputs.image }}} INVENTAR_DATA_ENCRYPTION_KEY: ${{ secrets.INVENTAR_DATA_ENCRYPTION_KEY }}
container_name: inventarsystem-app INVENTAR_MONGODB_PASSWORD: ${{ secrets.INVENTAR_MONGODB_PASSWORD }}
restart: unless-stopped EMAIL_ENABLED: ${{ secrets.EMAIL_ENABLED }}
env_file: EMAIL_SMTP_HOST: mai.invario-software.de
- .env EMAIL_SMTP_PORT: 587
ports: EMAIL_USERNAME: no-reply@invario-software.de
- "\${INVENTAR_HTTP_PORT:-10000}:8000" EMAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }}
depends_on: EMAIL_FROM_ADDRESS: ${{ secrets.EMAIL_FROM_ADDRESS }}
- mongodb expose:
- redis - "8000"
environment: volumes:
INVENTAR_MONGODB_HOST: mongodb - ./config.json:/app/config.json:ro
INVENTAR_MONGODB_PORT: "27017" - app_uploads:/app/Web/uploads
INVENTAR_MONGODB_DB: Inventarsystem - app_thumbnails:/app/Web/thumbnails
INVENTAR_BACKUP_FOLDER: /data/backups - app_previews:/app/Web/previews
INVENTAR_LOGS_FOLDER: /data/logs - app_qrcodes:/app/Web/QRCodes
expose: - app_backups:/data/backups
- "8000" - app_logs:/data/logs
volumes:
- ./config.json:/app/config.json:ro mongodb:
- app_uploads:/app/Web/uploads image: mongo:7.0
- app_thumbnails:/app/Web/thumbnails container_name: inventarsystem-mongodb
- app_previews:/app/Web/previews restart: unless-stopped
- app_qrcodes:/app/Web/QRCodes volumes:
- app_backups:/data/backups - mongodb_data:/data/db
- app_logs:/data/logs healthcheck:
test: ["CMD", "mongosh", "--quiet", "--eval", "db.adminCommand('ping').ok"]
mongodb: interval: 10s
image: mongo:7.0 timeout: 5s
container_name: inventarsystem-mongodb retries: 10
restart: unless-stopped
volumes: redis:
- mongodb_data:/data/db image: redis:7-alpine
healthcheck: container_name: inventarsystem-redis
test: ["CMD", "mongosh", "--quiet", "--eval", "db.adminCommand('ping').ok"] restart: unless-stopped
interval: 10s command: redis-server --appendonly yes --maxmemory 512mb --maxmemory-policy allkeys-lru
timeout: 5s ports:
retries: 10 - "6379:6379"
volumes:
redis: - redis_data:/data
image: redis:7-alpine healthcheck:
container_name: inventarsystem-redis test: ["CMD", "redis-cli", "ping"]
restart: unless-stopped interval: 10s
command: redis-server --appendonly yes --maxmemory 512mb --maxmemory-policy allkeys-lru timeout: 5s
ports: retries: 5
- "6379:6379"
volumes: volumes:
- redis_data:/data mongodb_data:
healthcheck: app_uploads:
test: ["CMD", "redis-cli", "ping"] app_thumbnails:
interval: 10s app_previews:
timeout: 5s app_qrcodes:
retries: 5 app_backups:
app_logs:
volumes: redis_data:
mongodb_data: EOF
app_uploads:
app_thumbnails: for f in start.sh stop.sh restart.sh backup.sh restore.sh config.json update.sh; do
app_previews: if [ -f "$f" ]; then
app_qrcodes: cp "$f" "release-bundle/$(basename "$f")"
app_backups: fi
app_logs: done
redis_data:
EOF 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
for f in start.sh stop.sh restart.sh backup.sh restore.sh config.json update.sh; do cp "$f" "release-bundle/$(basename "$f")"
if [ -f "$f" ]; then fi
cp "$f" "release-bundle/$(basename "$f")" done
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 .
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