Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package opensuse-nginx-image for
openSUSE:Factory checked in at 2021-04-15 16:58:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opensuse-nginx-image (Old)
and /work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opensuse-nginx-image"
Thu Apr 15 16:58:11 2021 rev:10 rq:885645 version:1.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/opensuse-nginx-image/opensuse-nginx-image.changes
2021-04-14 10:12:04.081604013 +0200
+++
/work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.12324/opensuse-nginx-image.changes
2021-04-15 16:58:54.502815858 +0200
@@ -1,0 +2,6 @@
+Thu Apr 15 12:21:42 UTC 2021 - Thorsten Kukuk <[email protected]>
+
+- Set timezone (TZ)
+- Allow debug mode of entrypoint scripts
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ README ++++++
--- /var/tmp/diff_new_pack.ZajvAx/_old 2021-04-15 16:58:54.950816567 +0200
+++ /var/tmp/diff_new_pack.ZajvAx/_new 2021-04-15 16:58:54.954816573 +0200
@@ -7,3 +7,7 @@
It is possible to only override nginx.conf:
podman run -d --rm -v /srv/nginx/etc/nginx.conf:/etc/nginx/nginx.conf --name
nginx -p 80:80/tcp -p 443:443/tcp registry.opensuse.org/opensuse/nginx
+
+Environment Variables:
+- DEBUG=[0|1] Run entrypoint script in debug mode
+- TZ=<timezone> Set timezone
++++++ entrypoint.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-entrypoint.d/30-populate-etc.sh
new/docker-entrypoint.d/30-populate-etc.sh
--- old/docker-entrypoint.d/30-populate-etc.sh 2021-04-13 20:57:07.947825181
+0200
+++ new/docker-entrypoint.d/30-populate-etc.sh 2021-04-15 14:19:08.066930926
+0200
@@ -1,6 +1,9 @@
#!/bin/bash
set -e
+DEBUG=${DEBUG:-"0"}
+[ "${DEBUG}" = "1" ] && set -x
+
ETC_DIR=/etc/nginx
# populate default nginx configuration if it does not exist
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-entrypoint.d/40-populate-htdocs.sh
new/docker-entrypoint.d/40-populate-htdocs.sh
--- old/docker-entrypoint.d/40-populate-htdocs.sh 2021-04-13
20:58:21.307632212 +0200
+++ new/docker-entrypoint.d/40-populate-htdocs.sh 2021-04-15
14:19:16.958954247 +0200
@@ -1,6 +1,9 @@
#!/bin/bash
set -e
+DEBUG=${DEBUG:-"0"}
+[ "${DEBUG}" = "1" ] && set -x
+
HTDOCS_DIR=/srv/www/htdocs
# populate default nginx configuration if it does not exist
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-entrypoint.d/50-set-timezone.sh
new/docker-entrypoint.d/50-set-timezone.sh
--- old/docker-entrypoint.d/50-set-timezone.sh 1970-01-01 01:00:00.000000000
+0100
+++ new/docker-entrypoint.d/50-set-timezone.sh 2021-04-15 14:20:46.471189004
+0200
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+DEBUG=${DEBUG:-"0"}
+[ "${DEBUG}" = "1" ] && set -x
+
+if [ -n "$TZ" ]; then
+ TZ_FILE="/usr/share/zoneinfo/$TZ"
+ if [ -f "$TZ_FILE" ]; then
+ echo "Setting container timezone to: $TZ"
+ ln -snf "$TZ_FILE" /etc/localtime
+ else
+ echo "Cannot set timezone \"$TZ\": timezone does not exist."
+ fi
+fi
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/usr/local/bin/entrypoint.sh
new/usr/local/bin/entrypoint.sh
--- old/usr/local/bin/entrypoint.sh 2021-04-13 21:01:52.583076421 +0200
+++ new/usr/local/bin/entrypoint.sh 2021-04-15 14:19:50.891043238 +0200
@@ -1,28 +1,32 @@
#!/bin/bash
set -e
+DEBUG=${DEBUG:-"0"}
+[ "${DEBUG}" = "1" ] && set -x
+
+
if /usr/bin/find "/docker-entrypoint.d/" -mindepth 1 -maxdepth 1 -type f
-print -quit 2>/dev/null | read v; then
- echo "$0: /docker-entrypoint.d/ is not empty, will attempt to perform
configuration"
+ echo "/docker-entrypoint.d/ is not empty, will attempt to perform
configuration"
- echo "$0: Looking for shell scripts in /docker-entrypoint.d/"
+ echo "Looking for shell scripts in /docker-entrypoint.d/"
find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read
-r f; do
case "$f" in
*.sh)
if [ -x "$f" ]; then
- echo "$0: Launching $f";
+ echo "Launching $f";
"$f"
else
# warn on shell scripts without exec bit
- echo "$0: Ignoring $f, not executable";
+ echo "Ignoring $f, not executable";
fi
;;
- *) echo "$0: Ignoring $f";;
+ *) echo "Ignoring $f";;
esac
done
- echo "$0: Configuration complete; ready for start up"
+ echo "Configuration complete; ready for start up"
else
- echo "$0: No files found in /docker-entrypoint.d/, skipping configuration"
+ echo "No files found in /docker-entrypoint.d/, skipping configuration"
fi
# allow arguments to be passed to nginx
