ddp/docker-compose
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Damien De Paoli
2023-08-25 22:51:14 +10:00
parent c89623aba1
commit 1cfcac194e
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
docker-compose.yml
View File

@@ -306,12 +306,13 @@ services:
- "636:636" - "636:636"
phpldapadmin: phpldapadmin:
image: osixia/phpldapadmin:latest image: ghcr.io/colibris-xyz/phpldapadmin:latest
container_name: phpldapadmin container_name: phpldapadmin
restart: always restart: always
environment: environment:
PHPLDAPADMIN_LDAP_HOSTS: "openldap" LDAP_HOST: "openldap"
PHPLDAPADMIN_HTTPS: "false" LDAP_USE_TLS: "false"
LDAP_BASE: "dc=depaoli,dc=id,dc=au"
labels: labels:
- "com.centurylinklabs.watchtower.enable=true" - "com.centurylinklabs.watchtower.enable=true"
- "traefik.enable=true" - "traefik.enable=true"
@@ -323,7 +324,7 @@ services:
- pihole - pihole
- openldap - openldap
volumes: 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 - /etc/localtime:/etc/localtime:ro
@@ -609,7 +610,7 @@ services:
pihole: pihole:
container_name: pihole container_name: pihole
image: pihole/pihole:v5.7 image: pihole/pihole:latest
ports: ports:
- "192.168.0.2:53:53/tcp" - "192.168.0.2:53:53/tcp"
- "192.168.0.2:53:53/udp" - "192.168.0.2:53:53/udp"
@@ -617,7 +618,7 @@ services:
environment: environment:
TZ: 'Australia/Melbourne' TZ: 'Australia/Melbourne'
WEBPASSWORD: 'O701JH&%fDqIw836eTiw1LxzlGw!sn%c' WEBPASSWORD: 'O701JH&%fDqIw836eTiw1LxzlGw!sn%c'
DNS1: '127.0.0.1' DNS1: '192.168.0.2'
DNS2: '208.67.222.222' DNS2: '208.67.222.222'
volumes: volumes:
- /srv/docker/container/pihole/etc/:/etc/pihole/ - /srv/docker/container/pihole/etc/:/etc/pihole/
@@ -798,7 +799,7 @@ services:
labels: labels:
- "com.centurylinklabs.watchtower.enable=true" - "com.centurylinklabs.watchtower.enable=true"
- "traefik.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=true"
- "traefik.http.routers.bitwarden_rs.tls.options=tls12@file" - "traefik.http.routers.bitwarden_rs.tls.options=tls12@file"
- "traefik.http.routers.bitwarden_rs.entrypoints=secureweb" - "traefik.http.routers.bitwarden_rs.entrypoints=secureweb"
@@ -806,7 +807,7 @@ services:
# auto-update docker images # auto-update docker images
watchtower: watchtower:
container_name: watchtower container_name: watchtower
image: containrrr/watchtower image: containrrr/watchtower:latest
command: --schedule "0 0 3 * * *" --debug --stop-timeout 60s --label-enable --cleanup command: --schedule "0 0 3 * * *" --debug --stop-timeout 60s --label-enable --cleanup
restart: always restart: always
depends_on: depends_on:
@@ -818,11 +819,11 @@ services:
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
wikidb: wikidb:
image: postgres:11-alpine image: postgres:latest
container_name: wikidb container_name: wikidb
environment: environment:
POSTGRES_DB: wiki POSTGRES_DB: wiki
POSTGRES_PASSWORD: testthisthing POSTGRES_PASSWORD: NOE82KzuLOr46EvJOJEmSXr4WW8Lt79Gdmr4n6eD765UHjaD22bvgs1cnU9x4RCn
POSTGRES_USER: wikijs POSTGRES_USER: wikijs
logging: logging:
driver: "none" driver: "none"
@@ -830,8 +831,11 @@ services:
depends_on: depends_on:
- openldap - openldap
- pihole - pihole
labels:
- "com.centurylinklabs.watchtower.enable=true"
volumes: 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" - "/etc/localtime:/etc/localtime:ro"
wiki: wiki:
@@ -845,7 +849,7 @@ services:
DB_HOST: wikidb DB_HOST: wikidb
DB_PORT: 5432 DB_PORT: 5432
DB_USER: wikijs DB_USER: wikijs
DB_PASS: testthisthing DB_PASS: NOE82KzuLOr46EvJOJEmSXr4WW8Lt79Gdmr4n6eD765UHjaD22bvgs1cnU9x4RCn
DB_NAME: wiki DB_NAME: wiki
restart: always restart: always
volumes: volumes:
@@ -1037,3 +1041,9 @@ services:
- "traefik.http.routers.kuma.tls=true" - "traefik.http.routers.kuma.tls=true"
- "traefik.http.routers.kuma.entrypoints=secureweb" - "traefik.http.routers.kuma.entrypoints=secureweb"
restart: always 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