Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ac316b9fe7 | |||
| fc9a82e0fc |
@@ -1,71 +1,53 @@
|
|||||||
# Vaultwarden Configuration - (Bitwarden-compatible) Password Manager
|
|
||||||
services:
|
services:
|
||||||
vaultwarden_db:
|
vaultwarden_db:
|
||||||
# PostgreSQL Database Configuration
|
|
||||||
container_name: vaultwarden_db
|
container_name: vaultwarden_db
|
||||||
image: docker.io/library/postgres:17.5
|
image: docker.io/library/postgres:17.5
|
||||||
restart: unless-stopped # Auto-recover from crashes
|
restart: unless-stopped
|
||||||
|
|
||||||
# Database credentials
|
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_USER=${POSTGRES_USER} # Database username
|
- POSTGRES_USER=${POSTGRES_USER}
|
||||||
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} # Database password
|
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
|
||||||
- POSTGRES_DB=${POSTGRES_DB} # Database name
|
- POSTGRES_DB=${POSTGRES_DB}
|
||||||
|
|
||||||
# Persistent storage configuration
|
|
||||||
volumes:
|
volumes:
|
||||||
- ${APPDATA_PATH}/vaultwarden/db:/var/lib/postgresql/data # Database files
|
- ${APPDATA_PATH}/vaultwarden/db:/var/lib/postgresql/data
|
||||||
|
|
||||||
# Network configuration
|
|
||||||
ports:
|
ports:
|
||||||
- ${DB_PORT}:5432 # PostgreSQL default port
|
- ${DB_PORT}:5432
|
||||||
networks:
|
networks:
|
||||||
- backend # Connects to backend network
|
- backend
|
||||||
|
|
||||||
# Health monitoring
|
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "pg_isready -d ${POSTGRES_DB} -U ${POSTGRES_USER}"] # Connection check
|
test: ["CMD-SHELL", "pg_isready -d ${POSTGRES_DB} -U ${POSTGRES_USER}"]
|
||||||
interval: 30s # Check every 30 seconds
|
interval: 30s
|
||||||
timeout: 5s # Maximum check duration
|
timeout: 5s
|
||||||
retries: 5 # Allow 5 failures before marking unhealthy
|
retries: 5
|
||||||
start_period: 20s # Initial grace period
|
start_period: 20s
|
||||||
|
|
||||||
vaultwarden_server:
|
vaultwarden_server:
|
||||||
container_name: vaultwarden_server
|
container_name: vaultwarden_server
|
||||||
# Container configuration
|
image: ghcr.io/dani-garcia/vaultwarden:1.34.1
|
||||||
image: ghcr.io/dani-garcia/vaultwarden:1.34.1 # Official Vaultwarden image
|
restart: unless-stopped
|
||||||
restart: unless-stopped # Auto-restart on failure
|
|
||||||
depends_on:
|
depends_on:
|
||||||
vaultwarden_db:
|
vaultwarden_db:
|
||||||
condition: service_healthy # Wait for healthy database
|
condition: service_healthy
|
||||||
|
|
||||||
# Application settings
|
|
||||||
environment:
|
environment:
|
||||||
- PUID=${PUID} # User ID for file permissions
|
- PUID=${PUID}
|
||||||
- PGID=${PGID} # Group ID for file permissions
|
- PGID=${PGID}
|
||||||
- TZ=${TZ} # Timezone configuration
|
- TZ=${TZ}
|
||||||
- DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@vaultwarden_db:5432/${POSTGRES_DB} # DB connection
|
- DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@vaultwarden_db:5432/${POSTGRES_DB}
|
||||||
- WEBSOCKET_ENABLED=${WEBSOCKET_ENABLED} # Real-time updates
|
- WEBSOCKET_ENABLED=${WEBSOCKET_ENABLED}
|
||||||
- LOG_FILE=/data/vaultwarden.log # Log file location
|
- LOG_FILE=/data/vaultwarden.log
|
||||||
# Uncomment and set these only on first run
|
# Uncomment and set these only on first run
|
||||||
# - DOMAIN=${DOMAIN} # Domain Name
|
# - DOMAIN=${DOMAIN}
|
||||||
# - SIGNUPS_ALLOWED=${SIGNUPS_ALLOWED} # User registration
|
# - SIGNUPS_ALLOWED=${SIGNUPS_ALLOWED}
|
||||||
# - ADMIN_TOKEN=${ADMIN_TOKEN} # Admin interface access token
|
# - ADMIN_TOKEN=${ADMIN_TOKEN}
|
||||||
|
|
||||||
# Persistent storage configuration
|
|
||||||
volumes:
|
volumes:
|
||||||
- ${APPDATA_PATH}/vaultwarden/data:/data # Vault data storage
|
- ${APPDATA_PATH}/vaultwarden/data:/data
|
||||||
|
|
||||||
# Network configuration
|
|
||||||
ports:
|
ports:
|
||||||
- ${SERVER_PORT}:80 # Web interface port
|
- ${SERVER_PORT}:80
|
||||||
networks:
|
networks:
|
||||||
- frontend # Connects to frontend network
|
- frontend
|
||||||
- backend # Connects to backend network
|
- backend
|
||||||
|
|
||||||
# External network definitions
|
|
||||||
networks:
|
networks:
|
||||||
frontend:
|
frontend:
|
||||||
external: true # Uses existing frontend network
|
external: true
|
||||||
backend:
|
backend:
|
||||||
external: true # Uses existing backend network
|
external: true
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ services:
|
|||||||
|
|
||||||
lldap:
|
lldap:
|
||||||
container_name: lldap
|
container_name: lldap
|
||||||
image: ghcr.io/lldap/lldap:v0.6.2-alpine-rootless@sha256:35df821899ec54c11eaab395e9c68e191e2582592cba343b0a904f6821aadcd2
|
image: ghcr.io/lldap/lldap:v0.6.3-alpine-rootless@sha256:ba2c50930ea998eefd5454aa678a7977448019248b1827da87d330df0b71c284
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
lldap_db:
|
lldap_db:
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ name: pangolin
|
|||||||
services:
|
services:
|
||||||
pangolin:
|
pangolin:
|
||||||
container_name: pangolin
|
container_name: pangolin
|
||||||
image: ghcr.io/fosrl/pangolin:1.18.1
|
image: ghcr.io/fosrl/pangolin:1.18.0
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ name: pangolin
|
|||||||
services:
|
services:
|
||||||
pangolin:
|
pangolin:
|
||||||
container_name: pangolin
|
container_name: pangolin
|
||||||
image: ghcr.io/fosrl/pangolin:1.18.1
|
image: ghcr.io/fosrl/pangolin:1.18.0
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- ./config:/app/config
|
- ./config:/app/config
|
||||||
|
|||||||
Reference in New Issue
Block a user