simple fix
master
This commit is contained in:
parent
4ea1288679
commit
7a14570601
@ -9,6 +9,9 @@ services:
|
||||
mode: host
|
||||
volumes:
|
||||
- dbdata:/var/lib/postgresql/data
|
||||
networks:
|
||||
- external
|
||||
- grafana-net
|
||||
environment:
|
||||
- POSTGRES_USER=${DBUSER}
|
||||
- POSTGRES_PASSWORD=${DBPASS}
|
||||
@ -18,6 +21,11 @@ services:
|
||||
volumes:
|
||||
dbdata:
|
||||
|
||||
networks:
|
||||
external:
|
||||
grafana-net:
|
||||
external: true
|
||||
|
||||
### Environment variables
|
||||
# DBUSER
|
||||
# DBPASS
|
||||
|
||||
@ -36,8 +36,6 @@ networks:
|
||||
internal:
|
||||
driver: overlay
|
||||
internal: true
|
||||
traefik-net:
|
||||
external: true
|
||||
grafana-net:
|
||||
external: true
|
||||
|
||||
|
||||
@ -23,6 +23,7 @@ services:
|
||||
- redis_data:/data
|
||||
networks:
|
||||
- internal
|
||||
command: redis-server --requirepass redis
|
||||
deploy:
|
||||
replicas: 1
|
||||
restart_policy:
|
||||
@ -53,21 +54,27 @@ services:
|
||||
- POSTGRES_DB=nextcloud
|
||||
- POSTGRES_HOST=db:5432
|
||||
- REDIS_HOST=redis
|
||||
- REDIS_HOST_PASSWORD=redis
|
||||
volumes:
|
||||
- nextcloud:/var/www/html
|
||||
- apps:/var/www/html/custom_apps
|
||||
- config:/var/www/html/config
|
||||
- data:/var/www/html/data
|
||||
# ports:
|
||||
# - target: 80
|
||||
# published: 8062
|
||||
# protocol: tcp
|
||||
# mode: host
|
||||
networks:
|
||||
- internal
|
||||
- external
|
||||
- traefik-net
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost/cron.php"]
|
||||
interval: 1m30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 40s
|
||||
# healthcheck:
|
||||
# test: ["CMD", "curl", "-f", "http://localhost/cron.php"]
|
||||
# interval: 1m30s
|
||||
# timeout: 10s
|
||||
# retries: 10
|
||||
# start_period: 5m
|
||||
deploy:
|
||||
mode: replicated
|
||||
replicas: 1
|
||||
@ -105,4 +112,4 @@ networks:
|
||||
external: true
|
||||
|
||||
### Environment variables
|
||||
# HOST
|
||||
# HOST
|
||||
@ -15,10 +15,16 @@ services:
|
||||
|
||||
portainer:
|
||||
image: portainer/portainer
|
||||
command: -H tcp://tasks.agent:9001 --tlsskipverify
|
||||
command: -H tcp://tasks.agent:9001 --tlsskipverify -H unix:///var/run/docker.sock
|
||||
ports:
|
||||
- "9000:9000"
|
||||
- "8000:8000"
|
||||
- target: 8000
|
||||
published: 8000
|
||||
protocol: tcp
|
||||
mode: host
|
||||
- target: 9000
|
||||
published: 9000
|
||||
protocol: tcp
|
||||
mode: host
|
||||
volumes:
|
||||
- portainer_data:/data
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
@ -37,5 +43,4 @@ networks:
|
||||
attachable: true
|
||||
|
||||
volumes:
|
||||
portainer_data:
|
||||
external: true
|
||||
portainer_data:
|
||||
@ -1,16 +1,23 @@
|
||||
version: '3.4'
|
||||
|
||||
services:
|
||||
|
||||
prometheus:
|
||||
image: prom/prometheus
|
||||
networks:
|
||||
- internal
|
||||
- external
|
||||
- prometheus-net
|
||||
- grafana-net
|
||||
volumes:
|
||||
- prometheus_config:/etc/prometheus
|
||||
- prometheus_data:/prometheus
|
||||
command:
|
||||
- "--config.file=/etc/prometheus/prometheus.yml"
|
||||
- "--storage.tsdb.path=/prometheus"
|
||||
- "--web.console.libraries=/usr/share/prometheus/console_libraries"
|
||||
- "--web.console.templates=/usr/share/prometheus/consoles"
|
||||
- "--storage.tsdb.retention.time=2y"
|
||||
- "--storage.tsdb.retention.size=5GB"
|
||||
deploy:
|
||||
mode: replicated
|
||||
replicas: 1
|
||||
@ -23,8 +30,9 @@ volumes:
|
||||
prometheus_config:
|
||||
prometheus_data:
|
||||
|
||||
|
||||
networks:
|
||||
internal:
|
||||
internal: true
|
||||
external:
|
||||
prometheus-net:
|
||||
driver: overlay
|
||||
|
||||
Loading…
Reference in New Issue
Block a user