From d8e6e0b0a00b437dfbce26bc6a814c230b9912c8 Mon Sep 17 00:00:00 2001 From: Christian Elberfeld <christian.elberfeld@adesso.de> Date: Tue, 9 Feb 2021 23:35:23 +0100 Subject: [PATCH] enable ipv6 listening --- common/docker_traefik/templates/docker-compose.yml | 13 +++++++++++-- .../docker_gitea/templates/docker-compose.yml | 12 ++++++++++-- .../docker_gitlab/templates/docker-compose.yml | 10 +++++++++- .../docker_icinga/templates/docker-compose.yml | 14 +++++++++++--- .../docker_jabber/templates/docker-compose.yml | 12 ++++++++++-- 5 files changed, 51 insertions(+), 10 deletions(-) diff --git a/common/docker_traefik/templates/docker-compose.yml b/common/docker_traefik/templates/docker-compose.yml index ca800dbe..b6a275f7 100644 --- a/common/docker_traefik/templates/docker-compose.yml +++ b/common/docker_traefik/templates/docker-compose.yml @@ -37,5 +37,14 @@ services: # - web networks: - web: - external: true + web: + external: true + default: + driver: bridge + enable_ipv6: true + ipam: + driver: default + config: + # must be a ULA range + - subnet: fd00:dead:beef:80::/64 + diff --git a/verwaltung/docker_gitea/templates/docker-compose.yml b/verwaltung/docker_gitea/templates/docker-compose.yml index 9da197a7..d67adbfe 100644 --- a/verwaltung/docker_gitea/templates/docker-compose.yml +++ b/verwaltung/docker_gitea/templates/docker-compose.yml @@ -1,5 +1,5 @@ -version: "3" +version: "2.4" services: @@ -9,7 +9,7 @@ services: depends_on: - db ports: - - 0.0.0.0:444:444 + - 444:444 volumes: - /srv/gitea/data:/data environment: @@ -53,3 +53,11 @@ services: networks: web: external: true + default: + driver: bridge + enable_ipv6: true + ipam: + driver: default + config: + # must be a ULA range + - subnet: fd00:dead:beef:444::/64 diff --git a/webserver/docker_gitlab/templates/docker-compose.yml b/webserver/docker_gitlab/templates/docker-compose.yml index d8f44e80..88743d8c 100644 --- a/webserver/docker_gitlab/templates/docker-compose.yml +++ b/webserver/docker_gitlab/templates/docker-compose.yml @@ -8,7 +8,7 @@ services: image: gitlab/gitlab-ce:13.4.4-ce.0 restart: always ports: - - 0.0.0.0:444:22 + - 444:22 volumes: - /srv/gitlab/conf:/etc/gitlab - /srv/gitlab/log:/var/log/gitlab @@ -25,3 +25,11 @@ services: networks: web: external: true + default: + driver: bridge + enable_ipv6: true + ipam: + driver: default + config: + # must be a ULA range + - subnet: fd00:dead:beef:444::/64 \ No newline at end of file diff --git a/webserver/docker_icinga/templates/docker-compose.yml b/webserver/docker_icinga/templates/docker-compose.yml index bcd3df98..b5e99d30 100644 --- a/webserver/docker_icinga/templates/docker-compose.yml +++ b/webserver/docker_icinga/templates/docker-compose.yml @@ -1,6 +1,6 @@ -version: "2" +version: "2.4" services: @@ -10,7 +10,7 @@ services: restart: always hostname: "{{ domain }}" ports: - - "0.0.0.0:{{ api_port }}:5665" + - "{{ api_port }}:5665" volumes: - "{{ basedir }}/data:/var/lib/icinga2" - "{{ basedir }}/etc/locale.gen:/etc/locale.gen" @@ -83,4 +83,12 @@ services: networks: web: - external: true \ No newline at end of file + external: true + default: + driver: bridge + enable_ipv6: true + ipam: + driver: default + config: + # must be a ULA range + - subnet: fd00:dead:beef:{{ api_port }}::/64 diff --git a/webserver/docker_jabber/templates/docker-compose.yml b/webserver/docker_jabber/templates/docker-compose.yml index 82f44f2f..f99fcbf1 100644 --- a/webserver/docker_jabber/templates/docker-compose.yml +++ b/webserver/docker_jabber/templates/docker-compose.yml @@ -1,5 +1,5 @@ -version: "3" +version: "2.4" services: @@ -49,4 +49,12 @@ services: networks: web: - external: true \ No newline at end of file + external: true + default: + driver: bridge + enable_ipv6: true + ipam: + driver: default + config: + # must be a ULA range + - subnet: fd00:dead:beef:5222::/64 -- GitLab