From 925dda5d5b031d711b66b3c2a9f70b334c6a9647 Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Sun, 6 Apr 2025 11:34:28 +0200
Subject: [PATCH] - Start Docker Tools 1.4 new features, - Add
 docker_network_up & docker_network_down scripts called by docker_start &
 docker_stop.

---
 ReadMe.txt               |  3 ++-
 ReleaseNotes.txt         | 10 +++++++++-
 sbin/docker_network_down | 25 +++++++++++++++++++++++++
 sbin/docker_network_up   | 21 +++++++++++++++++++++
 sbin/docker_start        |  2 ++
 sbin/docker_stop         |  2 ++
 6 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100755 sbin/docker_network_down
 create mode 100755 sbin/docker_network_up

diff --git a/ReadMe.txt b/ReadMe.txt
index ae17516..a771cf9 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -8,8 +8,9 @@ Features:
     - docker_tools_install & docker_mk_dir to setup a new application environment,
     - docker_mk_env command to compile env file into .env file,
     - docker_start, docker_stop & docker_logs command,
+    - docker_network_up & docker_network_down automatically called to setup external network rule & route,
     - docker_service_add env file function,
-    - docker_build_push.
+    - docker_build_push,
 
 Support different mounted volume modes:
     - Single,
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 52b1234..eb8353d 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,8 +1,16 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/Docker Tools V 1.4.0 - A. GIBERT - 2025/04/XX
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add docker_network_up & docker_network_down scripts called by docker_start & docker_stop.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3-Docker/Docker Tools V 1.3.7 - A. GIBERT - 2025/03/31
 ------------------------------------------------------------------------------------------------------------------------------------
 
-- Remove ${service_name} == ${APPL_NAME} exption hangling of *_IMG_URL.
+- Remove ${service_name} == ${APPL_NAME} exception handling for *_IMG_URL.
 
 
 
diff --git a/sbin/docker_network_down b/sbin/docker_network_down
new file mode 100755
index 0000000..892219d
--- /dev/null
+++ b/sbin/docker_network_down
@@ -0,0 +1,25 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------
+
+set -o errexit
+
+APPL_HOME_DIR="$(dirname "$(dirname "$0")")"
+
+
+
+#-------------------------------------------------------------------------------
+
+. .env
+
+if  [[ "${NETWORK_TABLE}" != "" ]]
+then
+    if [[ "$( ip rule list | grep "from ${NETWORK_ADDRESS}")" != "" ]]
+    then
+        ip rule del from ${NETWORK_ADDRESS}
+    fi
+
+    if [[ "$( ip route list table ${NETWORK_TABLE} | grep "${NETWORK_SUBNET}")" != "" ]]
+    then
+        ip route del ${NETWORK_SUBNET} table ${NETWORK_TABLE}
+    fi
+fi
diff --git a/sbin/docker_network_up b/sbin/docker_network_up
new file mode 100755
index 0000000..ec0fcab
--- /dev/null
+++ b/sbin/docker_network_up
@@ -0,0 +1,21 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------
+
+set -o errexit
+
+APPL_HOME_DIR="$(dirname "$(dirname "$0")")"
+
+
+
+#-------------------------------------------------------------------------------
+
+. .env
+
+if  [[ "${NETWORK_TABLE}" != "" ]]
+then
+    sbin/docker_network_down
+    
+    ip rule add from ${NETWORK_ADDRESS} table ${NETWORK_TABLE}
+
+    ip route add ${NETWORK_SUBNET} dev ${NETWORK_IF_NAME} table ${NETWORK_TABLE}
+fi
diff --git a/sbin/docker_start b/sbin/docker_start
index 40e1a73..15e23c7 100755
--- a/sbin/docker_start
+++ b/sbin/docker_start
@@ -13,3 +13,5 @@ sbin/docker_mk_env
 
 docker compose pull
 docker compose up -d
+
+sbin/docker_network_up
diff --git a/sbin/docker_stop b/sbin/docker_stop
index fba1729..955a3ab 100755
--- a/sbin/docker_stop
+++ b/sbin/docker_stop
@@ -10,3 +10,5 @@ APPL_HOME_DIR="$(dirname "$(dirname "$0")")"
 #-------------------------------------------------------------------------------
 
 docker compose down
+
+sbin/docker_network_down