uppped emby 4.9.0.30, locked docker-mailserver to 14.0.0 as watchtower quiety/partially broke it so do updates here manually, better last_commit url for bitnami openldap, move postgres dev to explicit latest, and to :17 for prod, cleaned up PA to now use a PA_ID, pass it to docker build and then use that to simplify wrapper to handle prod/container better

This commit is contained in:
2024-11-04 19:59:07 +11:00
parent 49d8f9f6c7
commit 72cfa77d57

View File

@@ -148,7 +148,7 @@ services:
emby: emby:
container_name: emby container_name: emby
# image: emby/embyserver:latest # image: emby/embyserver:latest
image: emby/embyserver:4.9.0.29 image: emby/embyserver:4.9.0.30
restart: always restart: always
network_mode: host network_mode: host
environment: environment:
@@ -180,8 +180,8 @@ 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:latest image: docker.io/mailserver/docker-mailserver:14.0.0
hostname: depaoli.id.au # hostname: depaoli.id.au
domainname: depaoli.id.au domainname: depaoli.id.au
container_name: mail container_name: mail
restart: always restart: always
@@ -271,7 +271,7 @@ services:
restart: always restart: always
labels: labels:
- "com.centurylinklabs.watchtower.enable=true" - "com.centurylinklabs.watchtower.enable=true"
# - "last.commit.url=https://api.github.com/bitnami/containers/tree/main/bitnami/openldap/commits - "last.commit.url=https://api.github.com/repos/bitnami/containers/commits?path=bitnami/openldap"
environment: environment:
BITNAMI_DEBUG: "true" BITNAMI_DEBUG: "true"
LDAP_ROOT: "dc=depaoli,dc=id,dc=au" LDAP_ROOT: "dc=depaoli,dc=id,dc=au"
@@ -325,7 +325,6 @@ services:
- ROUNDCUBEMAIL_SMTP_SERVER=ssl://depaoli.id.au - ROUNDCUBEMAIL_SMTP_SERVER=ssl://depaoli.id.au
- ROUNDCUBEMAIL_SMTP_PORT=465 - ROUNDCUBEMAIL_SMTP_PORT=465
portainer: portainer:
container_name: portainer container_name: portainer
image: portainer/portainer-ce:latest image: portainer/portainer-ce:latest
@@ -579,7 +578,7 @@ services:
bookdb_dev: bookdb_dev:
container_name: bookdb_dev container_name: bookdb_dev
image: postgres image: postgres:latest
restart: always restart: always
environment: environment:
POSTGRES_USER: ddp POSTGRES_USER: ddp
@@ -600,7 +599,7 @@ services:
bookdb: bookdb:
container_name: bookdb container_name: bookdb
image: postgres:16 image: postgres:17
restart: always restart: always
environment: environment:
POSTGRES_USER: ddp POSTGRES_USER: ddp
@@ -688,7 +687,7 @@ services:
padb: padb:
container_name: padb container_name: padb
image: postgres:16 image: postgres:17
restart: always restart: always
# replace entrypoint to install cron and a cron job to backup users so we can rebuild the content from sqls # replace entrypoint to install cron and a cron job to backup users so we can rebuild the content from sqls
entrypoint: /root/mara-init/entrypoint-wrapper.sh entrypoint: /root/mara-init/entrypoint-wrapper.sh
@@ -715,8 +714,8 @@ services:
build: build:
context: '/home/ddp/src/photoassistant' context: '/home/ddp/src/photoassistant'
args: args:
PJM_UID: 500 # uid for ddp (for dev/container)
PJM_GID: 500 PA_ID: "1000"
environment: environment:
ENV: "container" ENV: "container"
depends_on: depends_on:
@@ -736,8 +735,8 @@ services:
build: build:
context: '/home/ddp/src/photoassistant' context: '/home/ddp/src/photoassistant'
args: args:
PJM_UID: 500 # uid for mythtv (for prod)
PJM_GID: 500 PA_ID: "500"
environment: environment:
ENV: "production" ENV: "production"
depends_on: depends_on: