fixed watchtower to have latest tag, using different phpopenldap image that is being kept up to date (and using latest tag), moved pihole to latest tag (required tweaks to dnsmasq settings (in /srv/docker/container/pihole/...), updated wikidb to use latest postgres, and now using a real password

This commit is contained in:
2023-08-25 22:51:14 +10:00
parent c89623aba1
commit 1cfcac194e

View File

@@ -306,12 +306,13 @@ services:
- "636:636"
phpldapadmin:
image: osixia/phpldapadmin:latest
image: ghcr.io/colibris-xyz/phpldapadmin:latest
container_name: phpldapadmin
restart: always
environment:
PHPLDAPADMIN_LDAP_HOSTS: "openldap"
PHPLDAPADMIN_HTTPS: "false"
LDAP_HOST: "openldap"
LDAP_USE_TLS: "false"
LDAP_BASE: "dc=depaoli,dc=id,dc=au"
labels:
- "com.centurylinklabs.watchtower.enable=true"
- "traefik.enable=true"
@@ -323,7 +324,7 @@ services:
- pihole
- openldap
volumes:
- /srv/docker/container/phpldapadmin/var/www/phpldapadmin:/var/www/phpldapadmin
- /srv/docker/container/phpldapadmin/var/www/phpldapadmin:/var/www/html
- /etc/localtime:/etc/localtime:ro
@@ -609,7 +610,7 @@ services:
pihole:
container_name: pihole
image: pihole/pihole:v5.7
image: pihole/pihole:latest
ports:
- "192.168.0.2:53:53/tcp"
- "192.168.0.2:53:53/udp"
@@ -617,7 +618,7 @@ services:
environment:
TZ: 'Australia/Melbourne'
WEBPASSWORD: 'O701JH&%fDqIw836eTiw1LxzlGw!sn%c'
DNS1: '127.0.0.1'
DNS1: '192.168.0.2'
DNS2: '208.67.222.222'
volumes:
- /srv/docker/container/pihole/etc/:/etc/pihole/
@@ -798,7 +799,7 @@ services:
labels:
- "com.centurylinklabs.watchtower.enable=true"
- "traefik.enable=true"
- "traefik.http.routers.bitwarden_rs.rule=Host(`bw.depaoli.id.au`)"
- "traefik.http.routers.bitwarden_rs.rule=Host(`bw.depaoli.id.au`) || Host(`ddphome.asuscomm.com`)"
- "traefik.http.routers.bitwarden_rs.tls=true"
- "traefik.http.routers.bitwarden_rs.tls.options=tls12@file"
- "traefik.http.routers.bitwarden_rs.entrypoints=secureweb"
@@ -806,7 +807,7 @@ services:
# auto-update docker images
watchtower:
container_name: watchtower
image: containrrr/watchtower
image: containrrr/watchtower:latest
command: --schedule "0 0 3 * * *" --debug --stop-timeout 60s --label-enable --cleanup
restart: always
depends_on:
@@ -818,11 +819,11 @@ services:
- "/etc/localtime:/etc/localtime:ro"
wikidb:
image: postgres:11-alpine
image: postgres:latest
container_name: wikidb
environment:
POSTGRES_DB: wiki
POSTGRES_PASSWORD: testthisthing
POSTGRES_PASSWORD: NOE82KzuLOr46EvJOJEmSXr4WW8Lt79Gdmr4n6eD765UHjaD22bvgs1cnU9x4RCn
POSTGRES_USER: wikijs
logging:
driver: "none"
@@ -830,8 +831,11 @@ services:
depends_on:
- openldap
- pihole
labels:
- "com.centurylinklabs.watchtower.enable=true"
volumes:
- "/srv/docker/container/wikidb/:/var/lib/postgresql/data"
- "/srv/docker/container/wikidb/data:/var/lib/postgresql/data"
- "/srv/docker/container/wikidb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d"
- "/etc/localtime:/etc/localtime:ro"
wiki:
@@ -845,7 +849,7 @@ services:
DB_HOST: wikidb
DB_PORT: 5432
DB_USER: wikijs
DB_PASS: testthisthing
DB_PASS: NOE82KzuLOr46EvJOJEmSXr4WW8Lt79Gdmr4n6eD765UHjaD22bvgs1cnU9x4RCn
DB_NAME: wiki
restart: always
volumes:
@@ -1037,3 +1041,9 @@ services:
- "traefik.http.routers.kuma.tls=true"
- "traefik.http.routers.kuma.entrypoints=secureweb"
restart: always
# myth?
# this: https://github.com/delnaught/mythtv-containers/blob/main/compose-mythtv/docker-compose.yml
# in this link, there is also up a dir, docker/* that proivide Docker files, rather than compose to this guys repo?
# OR: https://hub.docker.com/r/instantlinux/mythtv-backend/tags
# should probably create 3 containers, mysql for mythtv, shepherd and then mythtv-backend