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