Skip to content

Commit 8b08a26

Browse files
committed
15-local-resolvers: strip trailing whitespace
Trailing whitespaces break configs that use quotation marks around vars. See nginxinc/docker-nginx-unprivileged#234
1 parent d92a4f0 commit 8b08a26

File tree

5 files changed

+15
-0
lines changed

5 files changed

+15
-0
lines changed

entrypoint/15-local-resolvers.envsh

+3
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
99
[ "${NGINX_ENTRYPOINT_LOCAL_RESOLVERS:-}" ] || return 0
1010

1111
NGINX_LOCAL_RESOLVERS=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {if ($2 ~ ":") {print "["$2"]"} else {print $2}}' /etc/resolv.conf)
12+
13+
NGINX_LOCAL_RESOLVERS="${NGINX_LOCAL_RESOLVERS% }"
14+
1215
export NGINX_LOCAL_RESOLVERS

mainline/alpine-slim/15-local-resolvers.envsh

+3
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
99
[ "${NGINX_ENTRYPOINT_LOCAL_RESOLVERS:-}" ] || return 0
1010

1111
NGINX_LOCAL_RESOLVERS=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {if ($2 ~ ":") {print "["$2"]"} else {print $2}}' /etc/resolv.conf)
12+
13+
NGINX_LOCAL_RESOLVERS="${NGINX_LOCAL_RESOLVERS% }"
14+
1215
export NGINX_LOCAL_RESOLVERS

mainline/debian/15-local-resolvers.envsh

+3
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
99
[ "${NGINX_ENTRYPOINT_LOCAL_RESOLVERS:-}" ] || return 0
1010

1111
NGINX_LOCAL_RESOLVERS=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {if ($2 ~ ":") {print "["$2"]"} else {print $2}}' /etc/resolv.conf)
12+
13+
NGINX_LOCAL_RESOLVERS="${NGINX_LOCAL_RESOLVERS% }"
14+
1215
export NGINX_LOCAL_RESOLVERS

stable/alpine-slim/15-local-resolvers.envsh

+3
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
99
[ "${NGINX_ENTRYPOINT_LOCAL_RESOLVERS:-}" ] || return 0
1010

1111
NGINX_LOCAL_RESOLVERS=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {if ($2 ~ ":") {print "["$2"]"} else {print $2}}' /etc/resolv.conf)
12+
13+
NGINX_LOCAL_RESOLVERS="${NGINX_LOCAL_RESOLVERS% }"
14+
1215
export NGINX_LOCAL_RESOLVERS

stable/debian/15-local-resolvers.envsh

+3
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
99
[ "${NGINX_ENTRYPOINT_LOCAL_RESOLVERS:-}" ] || return 0
1010

1111
NGINX_LOCAL_RESOLVERS=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {if ($2 ~ ":") {print "["$2"]"} else {print $2}}' /etc/resolv.conf)
12+
13+
NGINX_LOCAL_RESOLVERS="${NGINX_LOCAL_RESOLVERS% }"
14+
1215
export NGINX_LOCAL_RESOLVERS

0 commit comments

Comments
 (0)