8000 fixed some variable names that were overriding exported vars from con… · Sengorius/docker-proxy-stack@591b611 · GitHub 8000
[go: up one dir, main page]
Skip to content

Commit 591b611

Browse files
author
Sengorius
committed
fixed some variable names that were overriding exported vars from config file and simplified the update_host_files() method
1 parent 8e332c4 commit 591b611

File tree

1 file changed

+46
-58
lines changed

1 file changed

+46
-58
lines changed

‎src/main.sh

Lines changed: 46 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ function get_container_suffixes() {
4444
SUFFIXES="${!SUFFIXES}"
4545

4646
if [[ -z "$SUFFIXES" ]]; then
47-
if [[ "web" == "$TYPE" ]]; then
47+
if [[ "WEB" == "$TYPE" || "web" == "$TYPE" ]]; then
4848
SUFFIXES="web"
49-
elif [[ "app" == "$TYPE" ]]; then
49+
elif [[ "APP" == "$TYPE" || "app" == "$TYPE" ]]; then
5050
SUFFIXES="app|php"
5151
else
5252
print_error "Unknown container suffix type '$TYPE'!" 1
@@ -67,13 +67,12 @@ function get_container_names() {
6767
local APP_NAME
6868
APP_NAME=$(grep "^CON_NAME=" "$ENV_FILE" | sed -e 's/^CON_NAME=//' | sed -e 's/[[:space:]]*$//')
6969

70-
local APP_CONTAINER_SUFFIXES
71-
APP_CONTAINER_SUFFIXES=$(get_container_suffixes "APP")
70+
local ACF
71+
ACF=$(get_container_suffixes "APP")
7272

7373
if [[ -n "$APP_PREFIX" ]]; then
7474
local RUNNING_APPS=
75-
RUNNING_APPS=$(docker ps -aq -f name="^$APP_PREFIX((?:-|_).+)*(-|_)(${APP_CONTAINER_SUFFIXES})$" -f status="running")
76-
75+
RUNNING_APPS=$(docker ps -aq -f name="^$APP_PREFIX((?:-|_).+)*(-|_)($ACF)$" -f status="running")
7776
echo "$RUNNING_APPS"
7877

7978
elif [[ -n "$APP_NAME" ]]; then
@@ -95,13 +94,12 @@ function get_nginx_names() {
9594
local APP_NAME
9695
APP_NAME=$(grep "^CON_NAME=" "$ENV_FILE" | sed -e 's/^CON_NAME=//' | sed -e 's/[[:space:]]*$//')
9796

98-
local WEB_CONTAINER_SUFFIXES
99-
WEB_CONTAINER_SUFFIXES=$(get_container_suffixes "WEB")
97+
local WCF
98+
WCF=$(get_container_suffixes "WEB")
10099

101100
if [[ -n "$APP_PREFIX" ]]; then
102101
local RUNNING_APPS
103-
RUNNING_APPS=$(docker ps -aq -f name="^$APP_PREFIX((?:-|_).+)*(-|_)(${WEB_CONTAINER_SUFFIXES})$" -f status="running")
104-
102+
RUNNING_APPS=$(docker ps -aq -f name="^$APP_PREFIX((?:-|_).+)*(-|_)($WCF)$" -f status="running")
105103
echo "$RUNNING_APPS"
106104

107105
elif [[ -n "$APP_NAME" ]]; then
@@ -155,68 +153,58 @@ function update_host_files() {
155153
HOST_ACTION="append"
156154
fi
157155

158-
if [[ "0" != "${#WEB_CON_NAMES[@]}" || "0" != "${#APP_CON_NAMES[@]}" ]]; then
159-
SHALL_BE_PUBLISHED=
156+
local SHALL_BE_PUBLISHED=
160157

161-
for WEB_CON in "${WEB_CON_NAMES[@]}"; do
162-
WEB_CON_STATE=$(docker ps -a --format "table {{.Status}}\t{{.ID}}\t{{.Names}}" | grep "$WEB_CON")
158+
for WEB_CON in "${WEB_CON_NAMES[@]}"; do
159+
local WEB_IP
160+
WEB_IP=$(docker inspect --format '{{ range .NetworkSettings.Networks }}{{ .IPAddress }}{{ end }}' "$WEB_CON")
163161

164-
if [[ $WEB_CON_STATE == *"Up "* ]]; then
165-
local WEB_IP
166-
WEB_IP=$(docker inspect --format '{{ range .NetworkSettings.Networks }}{{ .IPAddress }}{{ end }}' "$WEB_CON")
162+
local WEB_HOST
163+
WEB_HOST=$(docker inspect --format '{{ .Config.Env }}' "$WEB_CON" | sed 's/^\[//g' | sed 's/\]$//g' | sed 's/, /,/g' | tr " " "\n" | sed 's/,/ /g' | grep VIRTUAL_HOST= | sed -e 's/^VIRTUAL_HOST=//' | sed -e 's/[[:space:]]*$//')
167164

168-
local WEB_HOST
169-
WEB_HOST=$(docker inspect --format '{{ .Config.Env }}' "$WEB_CON" | sed 's/^\[//g' | sed 's/\]$//g' | sed 's/, /,/g' | tr " " "\n" | sed 's/,/ /g' | grep VIRTUAL_HOST= | sed -e 's/^VIRTUAL_HOST=//' | sed -e 's/[[:space:]]*$//')
165+
local WEB_HASH
166+
WEB_HASH=$(docker inspect --format '{{ .Config.Hostname }}' "$WEB_CON")
170167

171-
local WEB_HASH
172-
WEB_HASH=$(docker inspect --format '{{ .Config.Hostname }}' "$WEB_CON")
168+
SHALL_BE_PUBLISHED=yes
173169

174-
SHALL_BE_PUBLISHED=yes
170+
# remove the line from temporary file, if existing
171+
if [[ "remove" == "$HOST_ACTION" ]]; then
172+
sed -i "/$WEB_HOST/d" "$TEMP_HOSTS_PATH"
173+
sed -i "/$WEB_HASH/d" "$TEMP_HOSTS_PATH"
175174

176-
# remove the line from temporary file, if existing
177-
if [[ "remove" == "$HOST_ACTION" ]]; then
178-
sed -i "/$WEB_HOST/d" "$TEMP_HOSTS_PATH"
179-
sed -i "/$WEB_HASH/d" "$TEMP_HOSTS_PATH"
180-
181-
# add the IP => HOST to the temporary file
182-
elif [[ -n "$WEB_IP" && -n "$WEB_HOST" ]] && ! grep -q "$WEB_HOST" "$TEMP_HOSTS_PATH"; then
183-
echo -e "$WEB_IP\t\t$WEB_HOST $WEB_HASH" >> "$TEMP_HOSTS_PATH"
184-
fi
185-
fi
186-
done
187-
188-
for APP_CON in "${APP_CON_NAMES[@]}"; do
189-
APP_CON_STATE=$(docker ps -a --format "table {{.Status}}\t{{.ID}}\t{{.Names}}" | grep "$APP_CON")
175+
# add the IP => HOST to the temporary file
176+
elif [[ -n "$WEB_IP" && -n "$WEB_HOST&qu 1E0A ot; ]] && ! grep -q "$WEB_HOST" "$TEMP_HOSTS_PATH"; then
177+
echo -e "$WEB_IP\t\t$WEB_HOST $WEB_HASH" >> "$TEMP_HOSTS_PATH"
178+
fi
179+
done
190180

191 F438 -
if [[ $APP_CON_STATE == *"Up "* ]]; then
192-
local APP_IP
193-
APP_IP=$(docker inspect --format '{{ range .NetworkSettings.Networks }}{{ .IPAddress }}{{ end }}' "$APP_CON")
181+
for APP_CON in "${APP_CON_NAMES[@]}"; do
182+
local APP_IP
183+
APP_IP=$(docker inspect --format '{{ range .NetworkSettings.Networks }}{{ .IPAddress }}{{ end }}' "$APP_CON")
194184

195-
local APP_HASH
196-
APP_HASH=$(docker inspect --format '{{ .Config.Hostname }}' "$APP_CON")
185+
local APP_HASH
186+
APP_HASH=$(docker inspect --format '{{ .Config.Hostname }}' "$APP_CON")
197187

198-
SHALL_BE_PUBLISHED=yes
188+
SHALL_BE_PUBLISHED=yes
199189

200-
# remove the line from temporary file, if existing
201-
if [[ "remove" == "$HOST_ACTION" ]]; then
202-
sed -i "/$APP_HASH/d" "$TEMP_HOSTS_PATH"
190+
# remove the line from temporary file, if existing
191+
if [[ "remove" == "$HOST_ACTION" ]]; then
192+
sed -i "/$APP_HASH/d" "$TEMP_HOSTS_PATH"
203193

204-
# add the IP => HOST to the temporary file
205-
elif [[ -n "$APP_IP" && -n "$APP_HASH" ]] && ! grep "$APP_HASH" "$TEMP_HOSTS_PATH"; then
206-
echo -e "$APP_IP\t\t$APP_HASH" >> "$TEMP_HOSTS_PATH"
207-
fi
208-
fi
209-
done
194+
# add the IP => HOST to the temporary file
195+
elif [[ -n "$APP_IP" && -n "$APP_HASH" ]] && ! grep "$APP_HASH" "$TEMP_HOSTS_PATH"; then
196+
echo -e "$APP_IP\t\t$APP_HASH" >> "$TEMP_HOSTS_PATH"
197+
fi
198+
done
210199

211-
if [[ -n "$SHALL_BE_PUBLISHED" ]]; then
212-
local APP_CONTAINER_SUFFIXES
213-
APP_CONTAINER_SUFFIXES=$(get_container_suffixes "APP")
200+
if [[ -n "$SHALL_BE_PUBLISHED" ]]; then
201+
local ACF
202+
ACF=$(get_container_suffixes "APP")
214203

215-
local WEB_CONTAINER_SUFFIXES
216-
WEB_CONTAINER_SUFFIXES=$(get_container_suffixes "WEB")
204+
local WCF
205+
WCF=$(get_container_suffixes "WEB")
217206

218-
publish_host_files "${APP_CONTAINER_SUFFIXES}|${WEB_CONTAINER_SUFFIXES}"
219-
fi
207+
publish_host_files "$ACF|$WCF"
220208
fi
221209
}
222210

0 commit comments

Comments
 (0)
0