Merge branch 'add-ip-address' of https://github.com/beornf/swarm-laun…

…cher into beornf-add-ip-address
ix-ai · Feb 6, 2021 · 2aa583f · 2aa583f
2 parents 4db4fb7 + c53241d
commit 2aa583f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -62,6 +62,7 @@ The following environment variables are important if you don't supply a `/docker
 | `LAUNCH_PORTS`          | -                          | NO            | Space separated list of PortOnHost:PortInContainer |
 | `LAUNCH_NETWORKS`       | -                          | NO            | Space separated list of project networks to create. All networks are created with `attachable: true` |
 | `LAUNCH_EXT_NETWORKS`   | -                          | NO            | Space separated list of external networks to attach to |
+| `LAUNCH_EXT_NETWORKS_IPV4` | -                       | NO            | Space separated list of ExternalNetwork:Ipv4Address |
 | `LAUNCH_CAP_ADD`        | -                          | NO            | Space separated list of capabilities to add |
 | `LAUNCH_CAP_DROP`       | -                          | NO            | Space separated list of capabilities to drop |
 | `LAUNCH_SECURITY_OPT`   | -                          | NO            | Space separated list of security options to add |

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -73,6 +73,7 @@ if [ -f ${COMPOSE_FILE} ]; then
     'LAUNCH_PORTS'
     'LAUNCH_NETWORKS'
     'LAUNCH_EXT_NETWORKS'
+    'LAUNCH_EXT_NETWORKS_IPV4'
     'LAUNCH_CAP_ADD'
     'LAUNCH_CAP_DROP'
     'LAUNCH_SECURITY_OPT'
@@ -253,10 +254,18 @@ xEOF
     if [ -n "${LAUNCH_NETWORKS}" ] || [ -n "${LAUNCH_EXT_NETWORKS}" ]; then
       echo "    networks:" >> ${COMPOSE_FILE}
       for NETWORK in ${LAUNCH_NETWORKS}; do
-        echo "      - ${NETWORK}" >> ${COMPOSE_FILE}
+        echo "      ${NETWORK}:" >> ${COMPOSE_FILE}
       done
       for NETWORK in ${LAUNCH_EXT_NETWORKS}; do
-        echo "      - ${NETWORK}" >> ${COMPOSE_FILE}
+        echo "      ${NETWORK}:" >> ${COMPOSE_FILE}
+        if [ -n "${LAUNCH_EXT_NETWORKS_IPV4}" ]; then
+          for NETWORK_IPV4 in ${LAUNCH_EXT_NETWORKS_IPV4}; do
+            if [ "${NETWORK_IPV4%%:*}" = "${NETWORK}" ]; then
+              echo "        ipv4_address: ${NETWORK_IPV4##*:}" >> ${COMPOSE_FILE}
+              break
+            fi
+          done
+        fi
       done
       echo "networks:" >> ${COMPOSE_FILE}
       for NETWORK in ${LAUNCH_NETWORKS}; do