introduced a new variable for containers, that should be ignored when publishing the /etc/hosts file

Sengorius · Sengorius · commit 19a9cafb9094 · 2024-03-26T12:05:56.000+01:00
diff --git a/.env.template b/.env.template
@@ -21,6 +21,11 @@ export WEB_CONTAINER_SUFFIXES="web"
 # separate multiple with pipes "|"
 export APP_CONTAINER_SUFFIXES="app|php"
 
+# if you want to ignore some containers from getting their /etc/hosts file updated
+# with local adresses - e.g. DNS services or Pi-Hole - enter the container names
+# here and separate multiple with pipes "|"
+export IGNORED_HOSTS_CONTAINERS=""
+
 # this will attach to the docker logs of the proxy containers after executing
 # `DockerExec proxy init` if set to 1
 export ATTACH_TO_COMPOSE_LOGS=1
diff --git a/DockerExec b/DockerExec
@@ -14,6 +14,7 @@ export LINUX_HOSTS=/etc/hosts
 export STATUS_FILE_NAME="docker_current.txt"
 export TEMP_HOSTS_FILE=".current-hosts"
 export UPD_FILE_NAME=".last-update"
+export IGNORED_HOSTS_CONTAINERS="${IGNORED_HOSTS_CONTAINERS:-}"
 
 export SRC_DIR="$BASE_DIR/src"
 export PROXY_ENV_FILE="$BASE_DIR/.env"
@@ -246,7 +247,7 @@ elif [[ "proxy" == "$ENVIRONMENT" ]]; then
             start_spawn_container "$file"
         done
 
-        # add all proxy containers (with there IP and hostname) to current hosts file
+        # add all proxy containers (with their IP and hostname) to current hosts file
         update_host_files_with_proxy
         publish_host_files "APP"
 
diff --git a/src/main.sh b/src/main.sh
@@ -283,6 +283,7 @@ function update_host_files_with_proxy() {
 # update the /etc/hosts file in any proxy related container with data from .current-hosts file
 function publish_host_files() {
     local HOST_CONTAINER_SUFFIXES=($(echo "$1" | tr "|" "\n"))
+    local IGNORED_CONTAINERS=($(echo "$IGNORED_HOSTS_CONTAINERS" | tr "|" "\n"))
     local FORMATTED_CONTAINERS=
 
     for NEXT_SUFFIX in "${HOST_CONTAINER_SUFFIXES[@]}"; do
@@ -296,7 +297,7 @@ function publish_host_files() {
     PROXY_CONTAINERS=$(docker ps -a --format '{{ .Names }}' -f status='running' -f name='proxy-')
 
     while read -r CURRENT; do
-        if [[ -n "$CURRENT" ]]; then
+        if [[ -n "$CURRENT" && ! "${IGNORED_CONTAINERS[*]}" =~ "$CURRENT" ]]; then
             CURRENT_CONTENT=$(docker exec -u root "$CURRENT" /bin/sh -c "cat /etc/hosts")
             CURRENT_CONTENT=$(echo "$CURRENT_CONTENT" | sed '/^### DockerExec hosts file update ###/,$d')
             UPDATED_HOSTS="$CURRENT_CONTENT\n### DockerExec hosts file update ###\n$(cat "$TEMP_HOSTS_PATH")"
