software package profiles implemeted, job deletion optimized
This commit is contained in:
+33
-16
@@ -27,15 +27,26 @@ services:
|
||||
environment:
|
||||
DATABASE_URL: postgresql+psycopg://${POSTGRES_USER:-assetmanager}:${POSTGRES_PASSWORD:-change-me}@db:5432/${POSTGRES_DB:-assetmanager}
|
||||
APP_TITLE: AssetManager
|
||||
APP_CONFIG: /app/config/config.json
|
||||
APPINFO_PATH: /app/config/APPINFO.json
|
||||
BACKUP_DIR: /data/backups
|
||||
ASSETMANAGER_DATA_ROOT: /assetmanager-data
|
||||
APP_CONFIG: /assetmanager-data/config/config.json
|
||||
APPINFO_PATH: /assetmanager-data/config/APPINFO.json
|
||||
UPLOAD_DIR: /assetmanager-data/uploads
|
||||
STANDARD_IMAGE_DIR: /assetmanager-data/uploads/library
|
||||
BACKUP_DIR: /assetmanager-data/backups
|
||||
BACKUP_INTERVAL_HOURS: ${BACKUP_INTERVAL_HOURS:-8}
|
||||
BACKUP_RETENTION_DAYS: ${BACKUP_RETENTION_DAYS:-3}
|
||||
MESHCENTRAL_PASSWORD: ${MESHCENTRAL_PASSWORD:-}
|
||||
SYNC_LOG_DIR: /app/data/logs/sync
|
||||
DIAGNOSTIC_DIR: /app/data/logs/diagnostics
|
||||
SOFTWARE_PACKAGE_DIR: /app/data/software-packages
|
||||
APP_LOG_DIR: /assetmanager-data/logs
|
||||
SYNC_LOG_DIR: /assetmanager-data/logs/sync
|
||||
DIAGNOSTIC_DIR: /assetmanager-data/logs/diagnostics
|
||||
SOFTWARE_PACKAGE_DIR: /assetmanager-data/software-packages
|
||||
ANALYZER_PROFILE_DIR: /assetmanager-data/analyzer-profiles
|
||||
SCRIPT_DIR: /assetmanager-data/scripts
|
||||
ANALYZER_PROFILE_REPOSITORY_URL: ${ANALYZER_PROFILE_REPOSITORY_URL:-}
|
||||
ANALYZER_PROFILE_MAX_BYTES: ${ANALYZER_PROFILE_MAX_BYTES:-2097152}
|
||||
ANALYZER_PROFILE_REPOSITORY_MAX_BYTES: ${ANALYZER_PROFILE_REPOSITORY_MAX_BYTES:-4194304}
|
||||
SOFTWARE_PACKAGE_IMPORT_MAX_MB: ${SOFTWARE_PACKAGE_IMPORT_MAX_MB:-8192}
|
||||
SOFTWARE_PACKAGE_IMPORT_MAX_FILES: ${SOFTWARE_PACKAGE_IMPORT_MAX_FILES:-20000}
|
||||
LDAP_BIND_PASSWORD: ${LDAP_BIND_PASSWORD:-}
|
||||
SESSION_SECRET: ${SESSION_SECRET:-}
|
||||
LOCAL_ADMIN_USERNAME: ${LOCAL_ADMIN_USERNAME:-}
|
||||
@@ -46,12 +57,9 @@ services:
|
||||
ports:
|
||||
- "${APP_PORT:-8088}:8000"
|
||||
volumes:
|
||||
- ./data/config:/app/config
|
||||
- ./data/uploads:/app/app/static/uploads
|
||||
- ./data/logs:/app/data/logs
|
||||
- ./data/backups:/data/backups
|
||||
- ./data/scripts:/scripts
|
||||
- ./data/software-packages:/app/data/software-packages
|
||||
# One persistent host root. The entrypoint creates all required
|
||||
# subdirectories below ./data automatically on every start.
|
||||
- ./data:/assetmanager-data
|
||||
|
||||
# Callback-only listener for Internet/DMZ scenarios.
|
||||
# Starts together with AssetManager and exposes only the callback POST endpoint
|
||||
@@ -66,8 +74,18 @@ services:
|
||||
environment:
|
||||
DATABASE_URL: postgresql+psycopg://${POSTGRES_USER:-assetmanager}:${POSTGRES_PASSWORD:-change-me}@db:5432/${POSTGRES_DB:-assetmanager}
|
||||
APP_TITLE: AssetManager
|
||||
APP_CONFIG: /app/config/config.json
|
||||
APPINFO_PATH: /app/config/APPINFO.json
|
||||
ASSETMANAGER_DATA_ROOT: /assetmanager-data
|
||||
APP_CONFIG: /assetmanager-data/config/config.json
|
||||
APPINFO_PATH: /assetmanager-data/config/APPINFO.json
|
||||
UPLOAD_DIR: /assetmanager-data/uploads
|
||||
STANDARD_IMAGE_DIR: /assetmanager-data/uploads/library
|
||||
BACKUP_DIR: /assetmanager-data/backups
|
||||
APP_LOG_DIR: /assetmanager-data/logs
|
||||
SYNC_LOG_DIR: /assetmanager-data/logs/sync
|
||||
DIAGNOSTIC_DIR: /assetmanager-data/logs/diagnostics
|
||||
SOFTWARE_PACKAGE_DIR: /assetmanager-data/software-packages
|
||||
ANALYZER_PROFILE_DIR: /assetmanager-data/analyzer-profiles
|
||||
SCRIPT_DIR: /assetmanager-data/scripts
|
||||
MESHCENTRAL_PASSWORD: ${MESHCENTRAL_PASSWORD:-}
|
||||
LDAP_BIND_PASSWORD: ${LDAP_BIND_PASSWORD:-}
|
||||
SESSION_SECRET: ${SESSION_SECRET:-}
|
||||
@@ -75,8 +93,7 @@ services:
|
||||
ports:
|
||||
- "${CALLBACK_BIND_IP:-127.0.0.1}:${CALLBACK_PORT:-8090}:8001"
|
||||
volumes:
|
||||
- ./data/config:/app/config
|
||||
- ./data/logs:/app/data/logs
|
||||
- ./data:/assetmanager-data
|
||||
healthcheck:
|
||||
test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://127.0.0.1:8001/api/software-callback/health', timeout=3).read()"]
|
||||
interval: 30s
|
||||
|
||||
Reference in New Issue
Block a user