Merge pull request #3 from nlnwa/fix_stats

Fix DNS_SERVERS param was ignored
nlnwa · Oct 18, 2018 · d591358 · d591358
2 parents 58fca05 + deb5d86
commit d591358
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -8,7 +8,7 @@ SQUID_VERSION=$(/usr/sbin/squid -v | grep Version | awk '{ print $4 }')
 if [ "$1" == "squid" ]; then
   echo "Staring squid [${SQUID_VERSION}]"
 
-  sudo /init-squid.sh
+  sudo /init-squid.sh $DNS_SERVERS
   /usr/sbin/squid -N -z
   exec /usr/sbin/squid -NYC
 else

diff --git a/init-squid.sh b/init-squid.sh
@@ -5,11 +5,11 @@
 # ----------------------------------------------------------------------------
 set -e
 
+DNS_SERVERS=$1
 if [ -n "$DNS_SERVERS" ]; then
   for s in $DNS_SERVERS; do
     export DNS_IP="$(nslookup ${s} | grep "Address 1" | cut -f3 -d' ') ${DNS_IP}"
   done
-  env
 fi
 /usr/bin/envsubst '${DNS_IP}' < /etc/squid/squid.conf.template > /etc/squid/squid.conf
 /bin/chown -R squid:squid /var/cache/squid