Compare commits
No commits in common. "master" and "docker_tools-1.3.7" have entirely different histories.
master
...
docker_too
@ -8,9 +8,8 @@ Features:
|
|||||||
- docker_tools_install & docker_mk_dir to setup a new application environment,
|
- docker_tools_install & docker_mk_dir to setup a new application environment,
|
||||||
- docker_mk_env command to compile env file into .env file,
|
- docker_mk_env command to compile env file into .env file,
|
||||||
- docker_start, docker_stop & docker_logs command,
|
- 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_service_add env file function,
|
||||||
- docker_build_push,
|
- docker_build_push.
|
||||||
|
|
||||||
Support different mounted volume modes:
|
Support different mounted volume modes:
|
||||||
- Single,
|
- Single,
|
||||||
|
@ -1,16 +1,8 @@
|
|||||||
------------------------------------------------------------------------------------------------------------------------------------
|
|
||||||
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
|
Rx3-Docker/Docker Tools V 1.3.7 - A. GIBERT - 2025/03/31
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Remove ${service_name} == ${APPL_NAME} exception handling for *_IMG_URL.
|
- Remove ${service_name} == ${APPL_NAME} exption hangling of *_IMG_URL.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,25 +0,0 @@
|
|||||||
#!/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
|
|
@ -1,21 +0,0 @@
|
|||||||
#!/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
|
|
@ -13,5 +13,3 @@ sbin/docker_mk_env
|
|||||||
|
|
||||||
docker compose pull
|
docker compose pull
|
||||||
docker compose up -d
|
docker compose up -d
|
||||||
|
|
||||||
sbin/docker_network_up
|
|
||||||
|
@ -10,5 +10,3 @@ APPL_HOME_DIR="$(dirname "$(dirname "$0")")"
|
|||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
docker compose down
|
docker compose down
|
||||||
|
|
||||||
sbin/docker_network_down
|
|
||||||
|
Loading…
Reference in New Issue
Block a user