docker networks: standardize names (#241)
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 <michael.grote@posteo.de> Reviewed-on: #241 Co-authored-by: Michael Grote <michael.grote@posteo.de> Co-committed-by: Michael Grote <michael.grote@posteo.de>
This commit is contained in:
parent
c4ee82d996
commit
c39d7f9fbc
4 changed files with 15 additions and 15 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue