upgraded emby
commented shitster so its works with my docker-updates parser for grafana removed tix* upgraded kuma to v2, removing kuma and replacing with mon for container name upgraded mail server
This commit is contained in:
@@ -145,7 +145,7 @@ services:
|
|||||||
emby:
|
emby:
|
||||||
container_name: emby
|
container_name: emby
|
||||||
# image: emby/embyserver:latest
|
# image: emby/embyserver:latest
|
||||||
image: emby/embyserver:4.9.0.42
|
image: emby/embyserver:4.9.0.44
|
||||||
restart: always
|
restart: always
|
||||||
network_mode: host
|
network_mode: host
|
||||||
environment:
|
environment:
|
||||||
@@ -177,8 +177,7 @@ services:
|
|||||||
|
|
||||||
# fail2ban might need a better whitelist? (I had internal docker ips in my quick fudge as well?)
|
# fail2ban might need a better whitelist? (I had internal docker ips in my quick fudge as well?)
|
||||||
mail:
|
mail:
|
||||||
# image: docker.io/mailserver/docker-mailserver:14.0.0
|
image: docker.io/mailserver/docker-mailserver:15.0.2
|
||||||
image: docker.io/mailserver/docker-mailserver:15.0.0
|
|
||||||
hostname: depaoli.id.au
|
hostname: depaoli.id.au
|
||||||
domainname: depaoli.id.au
|
domainname: depaoli.id.au
|
||||||
container_name: mail
|
container_name: mail
|
||||||
@@ -499,7 +498,7 @@ services:
|
|||||||
- /srv/docker/container/telegraf/monitoring-results:/usr/local/external-results/mara
|
- /srv/docker/container/telegraf/monitoring-results:/usr/local/external-results/mara
|
||||||
- /srv/docker/container/mythtv/monitoring-results:/usr/local/external-results/myth
|
- /srv/docker/container/mythtv/monitoring-results:/usr/local/external-results/myth
|
||||||
- /srv/docker/container/mail/monitoring-results:/usr/local/external-results/mail
|
- /srv/docker/container/mail/monitoring-results:/usr/local/external-results/mail
|
||||||
- /srv/docker/container/kuma/monitoring-results:/usr/local/external-results/kuma
|
- /srv/docker/container/mon/monitoring-results:/usr/local/external-results/kuma
|
||||||
- /srv/docker/container/samba/monitoring-results:/usr/local/external-results/samba
|
- /srv/docker/container/samba/monitoring-results:/usr/local/external-results/samba
|
||||||
# for telegraf to see host details
|
# for telegraf to see host details
|
||||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||||
@@ -777,48 +776,6 @@ services:
|
|||||||
- "traefik.http.routers.finplan.rule=Host(`finplan.ddp.net`)"
|
- "traefik.http.routers.finplan.rule=Host(`finplan.ddp.net`)"
|
||||||
- "traefik.http.routers.finplan.entrypoints=web"
|
- "traefik.http.routers.finplan.entrypoints=web"
|
||||||
|
|
||||||
tix:
|
|
||||||
container_name: tix
|
|
||||||
restart: always
|
|
||||||
environment:
|
|
||||||
ENV: "production"
|
|
||||||
# force using uid/gid of 1000/1000 so we can share dev/prod for now - may care enough 1 day to fix
|
|
||||||
build:
|
|
||||||
context: '/home/ddp/src/tix'
|
|
||||||
args:
|
|
||||||
USERID: "1000"
|
|
||||||
GROUPID: "1000"
|
|
||||||
user: "1000:1000"
|
|
||||||
volumes:
|
|
||||||
- /home/ddp/src/tix/:/tix
|
|
||||||
- /etc/localtime:/etc/localtime:ro
|
|
||||||
labels:
|
|
||||||
- "com.centurylinklabs.watchtower.enable=false"
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "traefik.http.routers.tix.rule=Host(`tix.depaoli.id.au`)"
|
|
||||||
- "traefik.http.routers.tix.tls=true"
|
|
||||||
- "traefik.http.routers.tix.entrypoints=secureweb"
|
|
||||||
- "traefik.http.routers.tix.tls.certresolver=myresolver"
|
|
||||||
|
|
||||||
# this runs cron to invoke the snow-ticket-analysis.py once a day to extract
|
|
||||||
# the next pdfs and add data to stats.db - then used by tix: to graph the data
|
|
||||||
tixbkend:
|
|
||||||
container_name: tixbkend
|
|
||||||
restart: always
|
|
||||||
environment:
|
|
||||||
ENV: "production"
|
|
||||||
# force using uid/gid of 1000/1000 so we can share dev/prod for now - may care enough 1 day to fix
|
|
||||||
build:
|
|
||||||
context: '/home/ddp/src/snow-ticket-analysis'
|
|
||||||
args:
|
|
||||||
USERID: "1000"
|
|
||||||
GROUPID: "1000"
|
|
||||||
volumes:
|
|
||||||
- /home/ddp/src/tix/:/tix/
|
|
||||||
- /etc/localtime:/etc/localtime:ro
|
|
||||||
labels:
|
|
||||||
- "com.centurylinklabs.watchtower.enable=false"
|
|
||||||
|
|
||||||
vaultwarden:
|
vaultwarden:
|
||||||
container_name: vaultwarden
|
container_name: vaultwarden
|
||||||
restart: always
|
restart: always
|
||||||
@@ -901,40 +858,17 @@ services:
|
|||||||
- "/etc/localtime:/etc/localtime:ro"
|
- "/etc/localtime:/etc/localtime:ro"
|
||||||
|
|
||||||
# NOT YET - API calls don't match DB, need to wait
|
# NOT YET - API calls don't match DB, need to wait
|
||||||
# mon:
|
mon:
|
||||||
# image: louislam/uptime-kuma:beta-slim
|
image: louislam/uptime-kuma:beta
|
||||||
# container_name: mon
|
container_name: mon
|
||||||
# volumes:
|
restart: always
|
||||||
# - /srv/docker/container/mon/data:/app/data
|
|
||||||
# - /srv/docker/container/mon/mara-bin:/root/mara-bin/
|
|
||||||
# - /srv/docker/container/mon/mara-init:/root/mara-init/
|
|
||||||
# - /var/run/docker.sock:/var/run/docker.sock:ro
|
|
||||||
# # used to transfer which containers we monitor through to telegraf
|
|
||||||
# - /srv/docker/container/mon/monitoring-results:/monitoring-results
|
|
||||||
# - /etc/localtime:/etc/localtime:ro
|
|
||||||
# entrypoint: /root/mara-init/entrypoint-wrapper.sh
|
|
||||||
# ports:
|
|
||||||
# - "0.0.0.0:13001:3001"
|
|
||||||
# labels:
|
|
||||||
# - "com.centurylinklabs.watchtower.enable=true"
|
|
||||||
# - "traefik.enable=true"
|
|
||||||
## - "traefik.http.routers.kuma.rule=Host(`mon.depaoli.id.au`)"
|
|
||||||
## - "traefik.http.routers.kuma.tls=true"
|
|
||||||
## - "traefik.http.routers.kuma.entrypoints=secureweb"
|
|
||||||
## - "traefik.http.routers.kuma.tls.certresolver=myresolver"
|
|
||||||
# - "last.commit.url=https://api.github.com/repos/louislam/uptime-kuma/commits"
|
|
||||||
# restart: always
|
|
||||||
|
|
||||||
kuma:
|
|
||||||
image: louislam/uptime-kuma:latest
|
|
||||||
container_name: kuma
|
|
||||||
volumes:
|
volumes:
|
||||||
- /srv/docker/container/kuma/data:/app/data
|
- /srv/docker/container/mon/data:/app/data
|
||||||
- /srv/docker/container/kuma/mara-bin:/root/mara-bin/
|
- /srv/docker/container/mon/mara-bin:/root/mara-bin/
|
||||||
- /srv/docker/container/kuma/mara-init:/root/mara-init/
|
- /srv/docker/container/mon/mara-init:/root/mara-init/
|
||||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||||
# used to transfer which containers we monitor through to telegraf
|
# used to transfer which containers we monitor through to telegraf
|
||||||
- /srv/docker/container/kuma/monitoring-results:/monitoring-results
|
- /srv/docker/container/mon/monitoring-results:/monitoring-results
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
entrypoint: /root/mara-init/entrypoint-wrapper.sh
|
entrypoint: /root/mara-init/entrypoint-wrapper.sh
|
||||||
ports:
|
ports:
|
||||||
@@ -942,12 +876,11 @@ services:
|
|||||||
labels:
|
labels:
|
||||||
- "com.centurylinklabs.watchtower.enable=true"
|
- "com.centurylinklabs.watchtower.enable=true"
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.routers.kuma.rule=Host(`mon.depaoli.id.au`)"
|
- "traefik.http.routers.mon.rule=Host(`mon.depaoli.id.au`)"
|
||||||
- "traefik.http.routers.kuma.tls=true"
|
- "traefik.http.routers.mon.tls=true"
|
||||||
- "traefik.http.routers.kuma.entrypoints=secureweb"
|
- "traefik.http.routers.mon.entrypoints=secureweb"
|
||||||
- "traefik.http.routers.kuma.tls.certresolver=myresolver"
|
- "traefik.http.routers.mon.tls.certresolver=myresolver"
|
||||||
- "last.commit.url=https://api.github.com/repos/louislam/uptime-kuma/commits"
|
- "last.commit.url=https://api.github.com/repos/louislam/uptime-kuma/commits"
|
||||||
restart: always
|
|
||||||
|
|
||||||
sshwifty:
|
sshwifty:
|
||||||
image: niruix/sshwifty:latest
|
image: niruix/sshwifty:latest
|
||||||
@@ -1117,12 +1050,14 @@ services:
|
|||||||
- "com.centurylinklabs.watchtower.enable=true"
|
- "com.centurylinklabs.watchtower.enable=true"
|
||||||
- "last.commit.url=https://api.github.com/repos/linuxserver/docker-mariadb/commits"
|
- "last.commit.url=https://api.github.com/repos/linuxserver/docker-mariadb/commits"
|
||||||
|
|
||||||
# shitster:
|
# shitster:
|
||||||
#image: node:19-bullseye
|
# image: node:19-bullseye
|
||||||
#container_name: shitster
|
# container_name: shitster
|
||||||
#working_dir: /app
|
# working_dir: /app
|
||||||
#volumes:
|
# volumes:
|
||||||
#- /srv/docker/container/shitster:/app
|
# - /srv/docker/container/shitster:/app
|
||||||
|
# labels:
|
||||||
|
# - "com.centurylinklabs.watchtower.enable=false"
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: php:apache
|
image: php:apache
|
||||||
|
|||||||
Reference in New Issue
Block a user