diff --git a/common/docker_traefik/templates/docker-compose.yml b/common/docker_traefik/templates/docker-compose.yml index ca800dbeaabdf5ae8d16cec7180c37ddb550a9fd..b6a275f7c6d7398913f756aa61eccac3043668d3 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 9da197a7fd97033ce406d1e84ea70335bba3134c..d67adbfe8dfcd2b6a9d4cc1cbf4f05081a7502a3 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 d8f44e80103d70e8e02fe647c3e513280d20fa94..88743d8c0bddc3e16349bc7a3e430207e5b9cd41 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 bcd3df98cd1ea5a1d2678039f17620479b6ad0b0..b5e99d305b3d465ae4cda00c8398812b27280c7c 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 82f44f2fc49814b660e32e82eae2dfd92307b1cd..f99fcbf13cdbf58edb48fcc174e8dfe4baeb7439 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