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