File tree Expand file tree Collapse file tree 6 files changed +8
-8
lines changed Expand file tree Collapse file tree 6 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 27
27
touch /$DEFAULT_CONF_FILE 2> /dev/null || { entrypoint_log " $ME : info: can not modify /$DEFAULT_CONF_FILE (read-only file system?)" ; exit 0; }
28
28
29
29
# 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; }
30
+ grep -q " listen \[::\] :80;" /$DEFAULT_CONF_FILE && { entrypoint_log " $ME : info: IPv6 listen already enabled" ; exit 0; }
31
31
32
32
if [ -f " /etc/os-release" ]; then
33
33
. /etc/os-release
Original file line number Diff line number Diff line change 27
27
touch /$DEFAULT_CONF_FILE 2> /dev/null || { entrypoint_log " $ME : info: can not modify /$DEFAULT_CONF_FILE (read-only file system?)" ; exit 0; }
28
28
29
29
# 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; }
30
+ grep -q " listen \[::\] :80;" /$DEFAULT_CONF_FILE && { entrypoint_log " $ME : info: IPv6 listen already enabled" ; exit 0; }
31
31
32
32
if [ -f " /etc/os-release" ]; then
33
33
. /etc/os-release
Original file line number Diff line number Diff line change @@ -30,11 +30,11 @@ RUN set -x \
30
30
pgp.mit.edu \
31
31
; do \
32
32
echo "Fetching GPG key $NGINX_GPGKEY from $server" ; \
33
- gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
33
+ gpg1 --batch -- keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
34
34
done; \
35
35
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
36
36
done; \
37
- gpg1 --export $NGINX_GPGKEYS > "$NGINX_GPGKEY_PATH" ; \
37
+ gpg1 --batch -- export $NGINX_GPGKEYS > "$NGINX_GPGKEY_PATH" ; \
38
38
rm -rf "$GNUPGHOME" ; \
39
39
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
40
40
&& dpkgArch="$(dpkg --print-architecture)" \
Original file line number Diff line number Diff line change 27
27
touch /$DEFAULT_CONF_FILE 2> /dev/null || { entrypoint_log " $ME : info: can not modify /$DEFAULT_CONF_FILE (read-only file system?)" ; exit 0; }
28
28
29
29
# 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; }
30
+ grep -q " listen \[::\] :80;" /$DEFAULT_CONF_FILE && { entrypoint_log " $ME : info: IPv6 listen already enabled" ; exit 0; }
31
31
32
32
if [ -f " /etc/os-release" ]; then
33
33
. /etc/os-release
Original file line number Diff line number Diff line change 27
27
touch /$DEFAULT_CONF_FILE 2> /dev/null || { entrypoint_log " $ME : info: can not modify /$DEFAULT_CONF_FILE (read-only file system?)" ; exit 0; }
28
28
29
29
# 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; }
30
+ grep -q " listen \[::\] :80;" /$DEFAULT_CONF_FILE && { entrypoint_log " $ME : info: IPv6 listen already enabled" ; exit 0; }
31
31
32
32
if [ -f " /etc/os-release" ]; then
33
33
. /etc/os-release
Original file line number Diff line number Diff line change @@ -30,11 +30,11 @@ RUN set -x \
30
30
pgp.mit.edu \
31
31
; do \
32
32
echo "Fetching GPG key $NGINX_GPGKEY from $server" ; \
33
- gpg1 --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
33
+ gpg1 --batch -- keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
34
34
done; \
35
35
test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
36
36
done; \
37
- gpg1 --export $NGINX_GPGKEYS > "$NGINX_GPGKEY_PATH" ; \
37
+ gpg1 --batch -- export $NGINX_GPGKEYS > "$NGINX_GPGKEY_PATH" ; \
38
38
rm -rf "$GNUPGHOME" ; \
39
39
apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
40
40
&& dpkgArch="$(dpkg --print-architecture)" \
You can’t perform that action at this time.
0 commit comments