Update to use single-line array for networks

Mugane · Nov 17, 2024 · 4996c74 · 4996c74
1 parent e80828e
commit 4996c74
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/templates/mariadb.json b/templates/mariadb.json
@@ -57,10 +57,10 @@
       "description": "Optional parameters to the mariadbd daemon such as `--skip-grant-tables` or `--sql_mode=NO_ENGINE_SUBSTITUTION`"
     },
     {
-      "name": "MYSQL_NETWORK",
-      "label": "Docker Network",
-      "default": "mariadb",
-      "description": "Network to use for communication between containers (single name, multiple networks not supported)" 
+      "name": "MYSQL_NETWORKS",
+      "label": "Docker Networks",
+      "default": "db, mariadb, mariadb_default",
+      "description": "Networks to use for communication between containers (comma-separated)" 
     },
     {
       "name": "MYSQL_ROOT_HOST",

diff --git a/templates/mariadb/docker-compose.yml b/templates/mariadb/docker-compose.yml
@@ -12,8 +12,7 @@ services:
       - "${MYSQL_PORT:-3306}:3306"
     volumes:
       - ${MOUNT_ROOT:-/var/lib/portainer}/${CONTAINER_NAME:-mariadb}/data:/var/lib/mariadb
-    networks:
-      - ${MYSQL_NETWORK:-db}
+    networks: [ ${MYSQL_NETWORKS:-mariadb} ]
     command: >
       /bin/bash -c "
       if [ ! -f /docker-entrypoint-initdb.d/init.sql ]; then

diff --git a/templates/mysql.json b/templates/mysql.json
@@ -57,10 +57,10 @@
       "description": "Optional parameters to the mysqld daemon such as `--skip-grant-tables` (safe mode) or `--sql_mode=NO_ENGINE_SUBSTITUTION` (for AWS RDS permission issues)" 
     },
     {
-      "name": "MYSQL_NETWORK",
-      "label": "Docker Network",
-      "default": "mysql",
-      "description": "Network to use for communication between containers (single name, multiple networks not supported)" 
+      "name": "MYSQL_NETWORKS",
+      "label": "Docker Networks",
+      "default": "db, mysql, mysql_default",
+      "description": "Networks to use for communication between containers (comma-separated)" 
     },
     {
       "name": "MYSQL_ROOT_HOST",

diff --git a/templates/mysql/docker-compose.yml b/templates/mysql/docker-compose.yml
@@ -11,8 +11,7 @@ services:
       - "${MYSQL_PORT:-3306}:3306"
     volumes:
       - ${MOUNT_ROOT:-/var/lib/portainer}/${CONTAINER_NAME:-mysql}/data:/var/lib/mysql
-    networks: 
-      - ${MYSQL_NETWORK:-db}
+    networks: [ ${MYSQL_NETWORKS:-mysql} ]
     command: >
       /bin/bash -c "
       if [ ! -f /docker-entrypoint-initdb.d/init.sql ]; then