diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index eb8353d..74f97da 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,8 +1,9 @@ ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/Docker Tools V 1.4.0 - A. GIBERT - 2025/04/XX +Rx3-Docker/Docker Tools V 1.4.0 - A. GIBERT - 2025/08/06 ------------------------------------------------------------------------------------------------------------------------------------ -- Add docker_network_up & docker_network_down scripts called by docker_start & docker_stop. +- Add docker_network_up & docker_network_down scripts called by docker_start & docker_stop, +- Add cd in script to allow external docker application dir call. diff --git a/sbin/docker_build_push b/sbin/docker_build_push index c08b99a..77e163a 100755 --- a/sbin/docker_build_push +++ b/sbin/docker_build_push @@ -9,6 +9,9 @@ APPL_HOME_DIR="$(dirname "$(dirname "$0")")" #------------------------------------------------------------------------------- +cd ${APPL_HOME_DIR} + + sbin/docker_mk_env docker compose build diff --git a/sbin/docker_logs b/sbin/docker_logs index a092b9e..cc3e684 100755 --- a/sbin/docker_logs +++ b/sbin/docker_logs @@ -9,4 +9,7 @@ APPL_HOME_DIR="$(dirname "$(dirname "$0")")" #------------------------------------------------------------------------------- +cd ${APPL_HOME_DIR} + + docker compose logs -f diff --git a/sbin/docker_mk_dir b/sbin/docker_mk_dir index 6c82514..09b087f 100755 --- a/sbin/docker_mk_dir +++ b/sbin/docker_mk_dir @@ -3,6 +3,13 @@ #set -o errexit +APPL_HOME_DIR="$(dirname "$(dirname "$0")")" + + + +#------------------------------------------------------------------------------- + +cd ${APPL_HOME_DIR} grep -e _LOG_ -e _LIB_ .env | grep -e _EXT= | while read line diff --git a/sbin/docker_network_down b/sbin/docker_network_down index 892219d..cd7ac02 100755 --- a/sbin/docker_network_down +++ b/sbin/docker_network_down @@ -9,6 +9,9 @@ APPL_HOME_DIR="$(dirname "$(dirname "$0")")" #------------------------------------------------------------------------------- +cd ${APPL_HOME_DIR} + + . .env if [[ "${NETWORK_TABLE}" != "" ]] diff --git a/sbin/docker_network_up b/sbin/docker_network_up index ec0fcab..77d8172 100755 --- a/sbin/docker_network_up +++ b/sbin/docker_network_up @@ -9,6 +9,9 @@ APPL_HOME_DIR="$(dirname "$(dirname "$0")")" #------------------------------------------------------------------------------- +cd ${APPL_HOME_DIR} + + . .env if [[ "${NETWORK_TABLE}" != "" ]] diff --git a/sbin/docker_start b/sbin/docker_start index 15e23c7..e83bd0b 100755 --- a/sbin/docker_start +++ b/sbin/docker_start @@ -9,6 +9,9 @@ APPL_HOME_DIR="$(dirname "$(dirname "$0")")" #------------------------------------------------------------------------------- +cd ${APPL_HOME_DIR} + + sbin/docker_mk_env docker compose pull diff --git a/sbin/docker_stop b/sbin/docker_stop index 955a3ab..dfcbcfc 100755 --- a/sbin/docker_stop +++ b/sbin/docker_stop @@ -9,6 +9,9 @@ APPL_HOME_DIR="$(dirname "$(dirname "$0")")" #------------------------------------------------------------------------------- +cd ${APPL_HOME_DIR} + + docker compose down sbin/docker_network_down