Removed network suffix

roles/docker-discourse/tasks/main.yml

@@ -47,22 +47,22 @@
     dest: "{{discourse_repository_directory}}containers/app.yml"
   notify: recreate discourse
 
-- name: "Ensure {{docker_compose_project_name}}_default_network network exists"
+- name: "Ensure {{docker_compose_project_name}}_default network exists"
   community.docker.docker_network:
-    name: "{{docker_compose_project_name}}_default_network"
+    name: "{{docker_compose_project_name}}_default"
     state: present
   when: enable_central_database | bool
 
-- name: "add central database temporary to {{docker_compose_project_name}}_default_network"
+- name: "add central database temporary to {{docker_compose_project_name}}_default"
   command:
-    cmd: "docker network connect discourse_default_network central-{{ database_type }}"
+    cmd: "docker network connect discourse_default central-{{ database_type }}"
   when: enable_central_database | bool
 
 - name: flush, to recreate discourse app
   meta: flush_handlers
   when: enable_central_database | bool
 
-- name: "remove central database from {{docker_compose_project_name}}_default_network"
+- name: "remove central database from {{docker_compose_project_name}}_default"
   command:
-    cmd: "docker network disconnect discourse_default_network central-{{ database_type }}"
+    cmd: "docker network disconnect discourse_default central-{{ database_type }}"
   when: enable_central_database | bool

roles/docker-discourse/templates/app.yml.j2

@@ -118,5 +118,5 @@ run:
   - exec: echo "End of custom commands"
 
 docker_args:
-  - --network={{docker_compose_project_name}}_default_network
+  - --network={{docker_compose_project_name}}_default
   - --name=discourse_application

roles/docker-mariadb/tasks/main.yml

@@ -1,6 +1,6 @@
 - name: Create Docker network for MariaDB
   docker_network:
-    name: central_mariadb_network
+    name: central_mariadb
     state: present
   when: run_once_docker_mariadb is not defined
 
@@ -18,7 +18,7 @@
       MARIADB_ROOT_PASSWORD:  "{{central_mariadb_root_password}}"
       MARIADB_AUTO_UPGRADE:   "1"
     networks:
-      - name: central_mariadb_network
+      - name: central_mariadb
     volumes:
       - central_mariadb_database:/var/lib/mysql
     published_ports:

roles/docker-postgres/tasks/main.yml

@@ -1,6 +1,6 @@
 - name: Create Docker network for PostgreSQL
   docker_network:
-    name: central_postgres_network
+    name: central_postgres
     state: present
   when: run_once_docker_postgres is not defined
 
@@ -13,7 +13,7 @@
       POSTGRES_PASSWORD: "{{ central_postgres_password }}"
       POSTGRES_INITDB_ARGS: "--encoding=UTF8 --locale=C" # Necessary for docker-matrix
     networks:
-      - name: central_postgres_network
+      - name: central_postgres
     published_ports:
       - "127.0.0.1:5432:5432"
     volumes:

templates/docker-compose-networks.yml.j2

@@ -1,8 +1,8 @@
 # This template needs to be included in docker-compose.yml
 networks:
 {% if enable_central_database | bool %}
-  central_{{ database_type }}_network:
+  central_{{ database_type }}:
     external: true
 {% endif %}
-  default_network:
+  default:
 {{ "\n" }}

templates/docker-container-networks.yml.j2

@@ -1,7 +1,7 @@
 # This template needs to be included in docker-compose.yml containers
     networks:
-      default_network:
+      default:
 {% if enable_central_database | bool %}
-      central_{{ database_type }}_network:
+      central_{{ database_type }}:
 {% endif %}
 {{ "\n" }}

templates/docker-service-mariadb.yml.j2

@@ -21,6 +21,6 @@
       timeout: 1s
       retries: 5
     networks:
-      - default_network
+      - default
 {% endif %}
 {{ "\n" }}

templates/docker-service-postgres.yml.j2

@@ -19,6 +19,6 @@
         source: database
         target: /var/lib/postgresql/data
     networks:
-      - default_network
+      - default
 {% endif %}
 {{ "\n" }}

templates/docker-service-redis.yml.j2

@@ -13,5 +13,5 @@
       timeout: 3s
       retries: 30
     networks:
-      - default_network
+      - default
 {{ "\n" }}