From ba08a111dd1068b809e8bb8b6d95cdc1b816bd46 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Fri, 15 Nov 2024 20:08:43 +0000 Subject: [PATCH] changed Files: docker-compose/miniflux/docker-compose.yml.j2 docker-compose/nextcloud/docker-compose.yml.j2 docker-compose/registry/docker-compose.yml.j2 friedhof/lldap/docker-compose.yml.j2 Signed-off-by: Michael Grote --- docker-compose/miniflux/docker-compose.yml.j2 | 8 ++++---- docker-compose/nextcloud/docker-compose.yml.j2 | 8 ++++---- docker-compose/registry/docker-compose.yml.j2 | 8 ++++---- friedhof/lldap/docker-compose.yml.j2 | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docker-compose/miniflux/docker-compose.yml.j2 b/docker-compose/miniflux/docker-compose.yml.j2 index 7064a97a..ef774d62 100644 --- a/docker-compose/miniflux/docker-compose.yml.j2 +++ b/docker-compose/miniflux/docker-compose.yml.j2 @@ -19,7 +19,7 @@ services: CLEANUP_ARCHIVE_READ_DAYS: 90 TZ: Europe/Berlin networks: - - intern + - internal - traefik healthcheck: test: ["CMD", "/usr/bin/miniflux", "-healthcheck", "auto"] @@ -45,7 +45,7 @@ services: volumes: - db17:/var/lib/postgresql/data networks: - - intern + - internal healthcheck: test: ["CMD", "pg_isready", "-U", "miniflux"] interval: 10s @@ -68,7 +68,7 @@ services: volumes: - ./filter.txt:/data/filter.txt networks: - - intern + - internal ######## Volumes ######## volumes: @@ -77,5 +77,5 @@ volumes: networks: traefik: external: true - intern: + internal: driver: bridge diff --git a/docker-compose/nextcloud/docker-compose.yml.j2 b/docker-compose/nextcloud/docker-compose.yml.j2 index c3652753..a0d9275b 100644 --- a/docker-compose/nextcloud/docker-compose.yml.j2 +++ b/docker-compose/nextcloud/docker-compose.yml.j2 @@ -17,7 +17,7 @@ services: MYSQL_USER: nextcloud MYSQL_INITDB_SKIP_TZINFO: 1 networks: - - intern + - internal healthcheck: test: ["CMD", "mariadb-show", "nextcloud", "-h", "localhost", "-u", "nextcloud", "-p{{ lookup('viczem.keepass.keepass', 'nextcloud/nextcloud_mysql_password', 'password') }}"] interval: 30s @@ -36,7 +36,7 @@ services: container_name: nextcloud-redis hostname: nextcloud-redis networks: - - intern + - internal restart: unless-stopped pull_policy: missing command: "redis-server --requirepass {{ lookup('viczem.keepass.keepass', 'nextcloud/nextcloud_redis_host_password', 'password') }}" @@ -101,7 +101,7 @@ services: - ./misc.sh:/docker-entrypoint-hooks.d/post-installation/misc.sh - ./misc.sh:/docker-entrypoint-hooks.d/before-starting/misc.sh networks: - - intern + - internal - traefik - postfix healthcheck: @@ -129,7 +129,7 @@ services: ######## Networks ######## networks: - intern: + internal: driver: bridge traefik: external: true diff --git a/docker-compose/registry/docker-compose.yml.j2 b/docker-compose/registry/docker-compose.yml.j2 index 01f5147c..61771d8d 100644 --- a/docker-compose/registry/docker-compose.yml.j2 +++ b/docker-compose/registry/docker-compose.yml.j2 @@ -8,7 +8,7 @@ services: - oci:/var/lib/registry networks: - traefik - - intern + - internal depends_on: - oci-registry-redis healthcheck: @@ -51,7 +51,7 @@ services: image: "redis:7.4.1" container_name: oci-registry-redis networks: - - intern + - internal restart: unless-stopped pull_policy: missing environment: @@ -80,7 +80,7 @@ services: - oci-registry networks: - traefik - - intern + - internal healthcheck: test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://127.0.0.1"] interval: 30s @@ -99,7 +99,7 @@ services: networks: traefik: external: true - intern: + internal: ######## Volumes ######## volumes: diff --git a/friedhof/lldap/docker-compose.yml.j2 b/friedhof/lldap/docker-compose.yml.j2 index 4ede0131..6fac1e05 100644 --- a/friedhof/lldap/docker-compose.yml.j2 +++ b/friedhof/lldap/docker-compose.yml.j2 @@ -11,7 +11,7 @@ services: # For the web front-end - "17170:17170" networks: - - intern + - internal - traefik - postfix volumes: @@ -56,7 +56,7 @@ services: - MYSQL_USER=lldap-db-user - MYSQL_INITDB_SKIP_TZINFO=1 networks: - - intern + - internal labels: - com.centurylinklabs.watchtower.enable=true @@ -66,7 +66,7 @@ volumes: db: ######## Networks ######## networks: - intern: + internal: traefik: external: true postfix: -- 2.43.0