|
@@ -4,7 +4,7 @@ set -e
|
|
# Warn if the DOCKER_HOST socket does not exist
|
|
# Warn if the DOCKER_HOST socket does not exist
|
|
if [[ $DOCKER_HOST = unix://* ]]; then
|
|
if [[ $DOCKER_HOST = unix://* ]]; then
|
|
socket_file=${DOCKER_HOST#unix://}
|
|
socket_file=${DOCKER_HOST#unix://}
|
|
- if ! [ -S $socket_file ]; then
|
|
|
|
|
|
+ if ! [ -S "$socket_file" ]; then
|
|
cat >&2 <<-EOT
|
|
cat >&2 <<-EOT
|
|
ERROR: you need to share your Docker host socket with a volume at $socket_file
|
|
ERROR: you need to share your Docker host socket with a volume at $socket_file
|
|
Typically you should run your nginxproxy/nginx-proxy with: \`-v /var/run/docker.sock:$socket_file:ro\`
|
|
Typically you should run your nginxproxy/nginx-proxy with: \`-v /var/run/docker.sock:$socket_file:ro\`
|
|
@@ -18,14 +18,14 @@ fi
|
|
/app/generate-dhparam.sh
|
|
/app/generate-dhparam.sh
|
|
|
|
|
|
# Compute the DNS resolvers for use in the templates - if the IP contains ":", it's IPv6 and must be enclosed in []
|
|
# Compute the DNS resolvers for use in the templates - if the IP contains ":", it's IPv6 and must be enclosed in []
|
|
-export RESOLVERS=$(awk '$1 == "nameserver" {print ($2 ~ ":")? "["$2"]": $2}' ORS=' ' /etc/resolv.conf | sed 's/ *$//g')
|
|
|
|
-if [ "x$RESOLVERS" = "x" ]; then
|
|
|
|
|
|
+RESOLVERS=$(awk '$1 == "nameserver" {print ($2 ~ ":")? "["$2"]": $2}' ORS=' ' /etc/resolv.conf | sed 's/ *$//g'); export RESOLVERS
|
|
|
|
+if [ "$RESOLVERS" = "" ]; then
|
|
echo "Warning: unable to determine DNS resolvers for nginx" >&2
|
|
echo "Warning: unable to determine DNS resolvers for nginx" >&2
|
|
unset RESOLVERS
|
|
unset RESOLVERS
|
|
fi
|
|
fi
|
|
|
|
|
|
# If the user has run the default command and the socket doesn't exist, fail
|
|
# If the user has run the default command and the socket doesn't exist, fail
|
|
-if [ "$socketMissing" = 1 -a "$1" = forego -a "$2" = start -a "$3" = '-r' ]; then
|
|
|
|
|
|
+if [ "$socketMissing" = 1 ] && [ "$1" = forego ] && [ "$2" = start ] && [ "$3" = '-r' ]; then
|
|
exit 1
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
|