Skip to content

Commit bdc3c7e

Browse files
alessfgalessfg
committed
Minor formatting fixes
1 parent 0dbce3e commit bdc3c7e

36 files changed

+977
-900
lines changed

‎Dockerfile-alpine-perl.template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ RUN set -x \
6666
# remove checksum deps
6767
&& apk del --no-network .checksum-deps \
6868
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
69-
&& if [ -n "$tempDir" ]; then rm -rf "$tempDir"; fi \
70-
&& if [ -n "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
71-
&& if [ -n "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi
69+
&& if [ -f "$tempDir" ]; then rm -rf "$tempDir"; fi \
70+
&& if [ -f "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
71+
&& if [ -f "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi

‎Dockerfile-alpine-slim.template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ RUN set -x \
7373
# remove checksum deps
7474
&& apk del --no-network .checksum-deps \
7575
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
76-
&& if [ -n "$tempDir" ]; then rm -rf "$tempDir"; fi \
77-
&& if [ -n "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
78-
&& if [ -n "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi \
76+
&& if [ -f "$tempDir" ]; then rm -rf "$tempDir"; fi \
77+
&& if [ -f "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
78+
&& if [ -f "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi \
7979
# Bring in gettext so we can get `envsubst`, then throw
8080
# the rest away. To do this, we need to install `gettext`
8181
# then move `envsubst` out of the way so `gettext` can

‎Dockerfile-alpine.template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ RUN set -x \
7171
# remove checksum deps
7272
&& apk del --no-network .checksum-deps \
7373
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
74-
&& if [ -n "$tempDir" ]; then rm -rf "$tempDir"; fi \
75-
&& if [ -n "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
76-
&& if [ -n "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi \
74+
&& if [ -f "$tempDir" ]; then rm -rf "$tempDir"; fi \
75+
&& if [ -f "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
76+
&& if [ -f "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi \
7777
# Bring in curl and ca-certificates to make registering on DNS SD easier
7878
&& apk add --no-cache curl ca-certificates

‎entrypoint/10-listen-on-ipv6-by-default.sh‎

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,68 @@
11
#!/bin/sh
2-
# vim:sw=4:ts=4:et
2+
# vim:sw=2:ts=2:sts=2:et
33

44
set -e
55

66
entrypoint_log() {
7-
if [ -z "${NGINX_ENTRYPOINT_QUIET_LOGS:-}" ]; then
8-
echo "$@"
9-
fi
7+
if [ -z "${NGINX_ENTRYPOINT_QUIET_LOGS:-}" ]; then
8+
echo "$@"
9+
fi
1010
}
1111

12-
ME=$(basename $0)
12+
ME=$(basename "$0")
1313
DEFAULT_CONF_FILE="etc/nginx/conf.d/default.conf"
1414

1515
# check if we have ipv6 available
1616
if [ ! -f "/proc/net/if_inet6" ]; then
17-
entrypoint_log "$ME: info: ipv6 not available"
18-
exit 0
17+
entrypoint_log "$ME: info: IPv6 is not available"
18+
exit 0
1919
fi
2020

2121
if [ ! -f "/$DEFAULT_CONF_FILE" ]; then
22-
entrypoint_log "$ME: info: /$DEFAULT_CONF_FILE is not a file or does not exist"
23-
exit 0
22+
entrypoint_log "$ME: info: /$DEFAULT_CONF_FILE is not a file or does not exist"
23+
exit 0
2424
fi
2525

2626
# check if the file can be modified, e.g. not on a r/o filesystem
27-
touch /$DEFAULT_CONF_FILE 2>/dev/null || { entrypoint_log "$ME: info: can not modify /$DEFAULT_CONF_FILE (read-only file system?)"; exit 0; }
27+
touch /$DEFAULT_CONF_FILE 2>/dev/null || {
28+
entrypoint_log "$ME: info: Cannot modify /$DEFAULT_CONF_FILE (read-only file system?)"
29+
exit 0
30+
}
2831

2932
# check if the file is already modified, e.g. on a container restart
30-
grep -q "listen \[::]\:80;" /$DEFAULT_CONF_FILE && { entrypoint_log "$ME: info: IPv6 listen already enabled"; exit 0; }
33+
grep -q "listen \[::]\:80;" /$DEFAULT_CONF_FILE && {
34+
entrypoint_log "$ME: info: Listen on IPv6 is already enabled"
35+
exit 0
36+
}
3137

3238
if [ -f "/etc/os-release" ]; then
33-
. /etc/os-release
39+
. /etc/os-release
3440
else
35-
entrypoint_log "$ME: info: can not guess the operating system"
36-
exit 0
41+
entrypoint_log "$ME: info: Cannot guess the operating system"
42+
exit 0
3743
fi
3844

3945
entrypoint_log "$ME: info: Getting the checksum of /$DEFAULT_CONF_FILE"
4046

4147
case "$ID" in
42-
"debian")
43-
CHECKSUM=$(dpkg-query --show --showformat='${Conffiles}\n' nginx | grep $DEFAULT_CONF_FILE | cut -d' ' -f 3)
44-
echo "$CHECKSUM /$DEFAULT_CONF_FILE" | md5sum -c - >/dev/null 2>&1 || {
45-
entrypoint_log "$ME: info: /$DEFAULT_CONF_FILE differs from the packaged version"
46-
exit 0
47-
}
48-
;;
49-
"alpine")
50-
CHECKSUM=$(apk manifest nginx 2>/dev/null| grep $DEFAULT_CONF_FILE | cut -d' ' -f 1 | cut -d ':' -f 2)
51-
echo "$CHECKSUM /$DEFAULT_CONF_FILE" | sha1sum -c - >/dev/null 2>&1 || {
52-
entrypoint_log "$ME: info: /$DEFAULT_CONF_FILE differs from the packaged version"
53-
exit 0
54-
}
55-
;;
56-
*)
57-
entrypoint_log "$ME: info: Unsupported distribution"
58-
exit 0
59-
;;
48+
"debian")
49+
CHECKSUM=$(dpkg-query --show --showformat='${Conffiles}\n' nginx | grep $DEFAULT_CONF_FILE | cut -d' ' -f 3)
50+
echo "$CHECKSUM /$DEFAULT_CONF_FILE" | md5sum -c - >/dev/null 2>&1 || {
51+
entrypoint_log "$ME: info: /$DEFAULT_CONF_FILE differs from the packaged version"
52+
exit 0
53+
}
54+
;;
55+
"alpine")
56+
CHECKSUM=$(apk manifest nginx 2>/dev/null | grep $DEFAULT_CONF_FILE | cut -d' ' -f 1 | cut -d ':' -f 2)
57+
echo "$CHECKSUM /$DEFAULT_CONF_FILE" | sha1sum -c - >/dev/null 2>&1 || {
58+
entrypoint_log "$ME: info: /$DEFAULT_CONF_FILE differs from the packaged version"
59+
exit 0
60+
}
61+
;;
62+
*)
63+
entrypoint_log "$ME: info: Unsupported distribution"
64+
exit 0
65+
;;
6066
esac
6167

6268
# enable ipv6 on default.conf listen sockets

‎entrypoint/15-local-resolvers.envsh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
88

99
[ "${NGINX_ENTRYPOINT_LOCAL_RESOLVERS:-}" ] || return 0
1010

11-
export NGINX_LOCAL_RESOLVERS=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print $2}' /etc/resolv.conf)
11+
NGINX_LOCAL_RESOLVERS=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print $2}' /etc/resolv.conf)
12+
export NGINX_LOCAL_RESOLVERS

‎entrypoint/20-envsubst-on-templates.sh‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#!/bin/sh
2+
# vim:sw=2:ts=2:sts=2:et
23

34
set -e
45

5-
ME=$(basename $0)
6+
ME=$(basename "$0")
67

78
entrypoint_log() {
8-
if [ -z "${NGINX_ENTRYPOINT_QUIET_LOGS:-}" ]; then
9-
echo "$@"
10-
fi
9+
if [ -z "${NGINX_ENTRYPOINT_QUIET_LOGS:-}" ]; then
10+
echo "$@"
11+
fi
1112
}
1213

1314
add_stream_block() {
@@ -17,9 +18,12 @@ add_stream_block() {
1718
entrypoint_log "$ME: $conffile contains a stream block; include $stream_output_dir/*.conf to enable stream templates"
1819
else
1920
# check if the file can be modified, e.g. not on a r/o filesystem
20-
touch "$conffile" 2>/dev/null || { entrypoint_log "$ME: info: can not modify $conffile (read-only file system?)"; exit 0; }
21-
entrypoint_log "$ME: Appending stream block to $conffile to include $stream_output_dir/*.conf"
22-
cat << END >> "$conffile"
21+
touch "$conffile" 2>/dev/null || {
22+
entrypoint_log "$ME: ERROR: can not modify $conffile (read-only file system?)"
23+
exit 0
24+
}
25+
entrypoint_log "$ME: info: Appending stream block to $conffile to include $stream_output_dir/*.conf"
26+
cat <<END >>"$conffile"
2327
# added by "$ME" on "$(date)"
2428
stream {
2529
include $stream_output_dir/*.conf;
@@ -37,20 +41,21 @@ auto_envsubst() {
3741
local filter="${NGINX_ENVSUBST_FILTER:-}"
3842

3943
local template defined_envs relative_path output_path subdir
40-
defined_envs=$(printf '${%s} ' $(awk "END { for (name in ENVIRON) { print ( name ~ /${filter}/ ) ? name : \"\" } }" < /dev/null ))
44+
45+
defined_envs=$(printf '${%s} ' $(awk "END { for (name in ENVIRON) { print ( name ~ /${filter}/ ) ? name : \"\" } }" </dev/null))
4146
[ -d "$template_dir" ] || return 0
4247
if [ ! -w "$output_dir" ]; then
4348
entrypoint_log "$ME: ERROR: $template_dir exists, but $output_dir is not writable"
4449
return 0
4550
fi
4651
find "$template_dir" -follow -type f -name "*$suffix" -print | while read -r template; do
47-
relative_path="${template#$template_dir/}"
48-
output_path="$output_dir/${relative_path%$suffix}"
52+
relative_path="${template#"$template_dir/"}"
53+
output_path="$output_dir/${relative_path%"$suffix"}"
4954
subdir=$(dirname "$relative_path")
5055
# create a subdirectory where the template file exists
5156
mkdir -p "$output_dir/$subdir"
52-
entrypoint_log "$ME: Running envsubst on $template to $output_path"
53-
envsubst "$defined_envs" < "$template" > "$output_path"
57+
entrypoint_log "$ME: info: Running envsubst on $template to $output_path"
58+
envsubst "$defined_envs" <"$template" >"$output_path"
5459
done
5560

5661
# Print the first file with the stream suffix, this will be false if there are none
@@ -62,13 +67,13 @@ auto_envsubst() {
6267
fi
6368
add_stream_block
6469
find "$template_dir" -follow -type f -name "*$stream_suffix" -print | while read -r template; do
65-
relative_path="${template#$template_dir/}"
66-
output_path="$stream_output_dir/${relative_path%$stream_suffix}"
70+
relative_path="${template#"$template_dir/"}"
71+
output_path="$stream_output_dir/${relative_path%"$stream_suffix"}"
6772
subdir=$(dirname "$relative_path")
6873
# create a subdirectory where the template file exists
6974
mkdir -p "$stream_output_dir/$subdir"
70-
entrypoint_log "$ME: Running envsubst on $template to $output_path"
71-
envsubst "$defined_envs" < "$template" > "$output_path"
75+
entrypoint_log "$ME: info: Running envsubst on $template to $output_path"
76+
envsubst "$defined_envs" <"$template" >"$output_path"
7277
done
7378
fi
7479
}

0 commit comments

Comments
 (0)