cleaned up names of traefik rules for developed containers, added padev, made myth container be "from scratch", taking an ubuntu:latest image and just adding mythbuntu, etc.

This commit is contained in:
2024-05-05 12:10:13 +10:00
parent fa84f9b914
commit 0fe30e2e74

View File

@@ -360,7 +360,7 @@ services:
# this is running network_mode: host so it is on the same subnet as the IoT
# devices and can see/discover them
hass:
image: ghcr.io/home-assistant/home-assistant:stable
image: ghcr.io/home-assistant/home-assistant
container_name: hass
privileged: true
network_mode: host
@@ -640,8 +640,8 @@ services:
labels:
- "com.centurylinklabs.watchtower.enable=false"
- "traefik.enable=true"
- "traefik.http.routers.bookdb_webdev.rule=Host(`bookdev.ddp.net`)"
- "traefik.http.routers.bookdb_webdev.entrypoints=web"
- "traefik.http.routers.bookdev.rule=Host(`bookdev.ddp.net`)"
- "traefik.http.routers.bookdev.entrypoints=web"
book:
container_name: book
@@ -658,10 +658,10 @@ services:
labels:
- "com.centurylinklabs.watchtower.enable=false"
- "traefik.enable=true"
- "traefik.http.routers.bookdb_web.rule=Host(`book.depaoli.id.au`)"
- "traefik.http.routers.bookdb_web.tls=true"
- "traefik.http.routers.bookdb_web.entrypoints=secureweb"
- "traefik.http.routers.bookdb_web.tls.certresolver=myresolver"
- "traefik.http.routers.book.rule=Host(`book.depaoli.id.au`)"
- "traefik.http.routers.book.tls=true"
- "traefik.http.routers.book.entrypoints=secureweb"
- "traefik.http.routers.book.tls.certresolver=myresolver"
padb_dev:
container_name: padb_dev
@@ -709,8 +709,29 @@ services:
- /srv/docker/container/padb/mara-bin:/root/mara-bin
- /etc/localtime:/etc/localtime:ro
paweb:
container_name: paweb
padev:
container_name: padev
restart: always
build:
context: '/home/ddp/src/photoassistant'
args:
PJM_UID: 500
PJM_GID: 500
environment:
ENV: "container"
depends_on:
- padb_dev
volumes:
- /home/ddp/src/photoassistant:/home/ddp/src/photoassistant
- /etc/localtime:/etc/localtime:ro
labels:
- "com.centurylinklabs.watchtower.enable=false"
- "traefik.enable=true"
- "traefik.http.routers.padev.rule=Host(`padev.ddp.net`)"
- "traefik.http.routers.padev.entrypoints=web"
pa:
container_name: pa
restart: always
build:
context: '/home/ddp/src/photoassistant'
@@ -727,10 +748,10 @@ services:
labels:
- "com.centurylinklabs.watchtower.enable=false"
- "traefik.enable=true"
- "traefik.http.routers.paweb.rule=Host(`pa.depaoli.id.au`)"
- "traefik.http.routers.paweb.tls=true"
- "traefik.http.routers.paweb.entrypoints=secureweb"
- "traefik.http.routers.paweb.tls.certresolver=myresolver"
- "traefik.http.routers.pa.rule=Host(`pa.depaoli.id.au`)"
- "traefik.http.routers.pa.tls=true"
- "traefik.http.routers.pa.entrypoints=secureweb"
- "traefik.http.routers.pa.tls.certresolver=myresolver"
tix:
container_name: tix
@@ -829,33 +850,33 @@ services:
volumes:
- "/etc/localtime:/etc/localtime:ro"
# ark-server:
# restart: always
# image: hermsi/ark-server
# container_name: ark-server
# volumes:
# - /srv/docker/container/ark-server:/app
# - /srv/docker/container/ark-server-backups:/home/steam/ARK-Backups
# environment:
# - "SESSION_NAME=The Island - ARK"
# - "SERVER_MAP=TheIsland"
# - "SERVER_PASSWORD=bagrid"
# - "ADMIN_PASSWORD=arkadminpassword"
# - "MAX_PLAYERS=5"
# - "UPDATE_ON_START=false"
# - "BACKUP_ON_STOP=true"
# - "PRE_UPDATE_BACKUP=true"
# - "WARN_ON_STOP=true"
# - "GAME_MOD_IDS=1404697612,1428596566,772235118,895711211"
# ports:
# # Port for connections from ARK game client
# - "7777:7777/udp"
# # Raw UDP socket port (always Game client port +1)
# - "7778:7778/udp"
# # RCON management port
# - "27020:27020/tcp"
# # Steam's server-list port
# - "27015:27015/udp"
ark-server:
restart: always
image: hermsi/ark-server
container_name: ark-server
volumes:
- /srv/docker/container/ark-server:/app
- /srv/docker/container/ark-server-backups:/home/steam/ARK-Backups
environment:
- "SESSION_NAME=The Island - ARK"
- "SERVER_MAP=TheIsland"
- "SERVER_PASSWORD=bagrid"
- "ADMIN_PASSWORD=arkadminpassword"
- "MAX_PLAYERS=5"
- "UPDATE_ON_START=false"
- "BACKUP_ON_STOP=true"
- "PRE_UPDATE_BACKUP=true"
- "WARN_ON_STOP=true"
- "GAME_MOD_IDS=1404697612,1428596566,772235118,895711211,731604991"
ports:
# Port for connections from ARK game client
- "7777:7777/udp"
# Raw UDP socket port (always Game client port +1)
- "7778:7778/udp"
# RCON management port
- "27020:27020/tcp"
# Steam's server-list port
- "27015:27015/udp"
kuma:
image: louislam/uptime-kuma
@@ -924,7 +945,7 @@ services:
# hacked entrypoint to 'add' to this container so it works as mara needs
myth:
container_name: myth
image: instantlinux/mythtv-backend:latest
image: ubuntu:latest
hostname: ${HOSTNAME_MYTHTV:-mythtv}
restart: always
labels:
@@ -937,12 +958,9 @@ services:
environment:
APACHE_LOG_DIR: /var/log/apache2
DBNAME: mythconverg
# needs to be ip not container name as the host network_mode and DNS dont work together
# test this as mythdb and remove network_mode host when I can
DBSERVER: mythdb
LANG: en_US.UTF-8
LANGUAGE: en_US.UTF-8
LOCALHOSTNAME: mara
TZ: Australia/Melbourne
ports:
- "6543:6543"
@@ -961,7 +979,7 @@ services:
- /srv/docker/container/mythtv/db/sql:/db-container/sql
- /srv/docker/container/mythtv/db/backups:/db-container/backups
- /srv/docker/container/mythtv/monitoring-results:/monitoring-results
- /etc/localtime:/etc/localtime:ro
# - /etc/localtime:/etc/localtime:ro
- /export/myth:/export/myth
- /export/docker/storage/other-videos:/export/myth/videos
devices: