Hello community,
here is the log from the commit of package opensuse-nginx-image for
openSUSE:Factory checked in at 2020-05-11 17:09:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opensuse-nginx-image (Old)
and /work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opensuse-nginx-image"
Mon May 11 17:09:25 2020 rev:7 rq:802689 version:1.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/opensuse-nginx-image/opensuse-nginx-image.changes
2020-05-09 22:19:25.899617823 +0200
+++
/work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.2738/opensuse-nginx-image.changes
2020-05-11 17:09:29.415353653 +0200
@@ -1,0 +2,11 @@
+Mon May 11 12:58:26 UTC 2020 - Richard Brown <rbr...@suse.com>
+
+- Only install default htdocs if htdocs directory is totally empty
+
+-------------------------------------------------------------------
+Mon May 11 11:45:43 UTC 2020 - Thorsten Kukuk <ku...@suse.com>
+
+- Add bash as it is required by entrypoint script
+- Fix EXTRA_ARGS handling
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-nginx-image.kiwi ++++++
--- /var/tmp/diff_new_pack.xPQOTg/_old 2020-05-11 17:09:30.183356686 +0200
+++ /var/tmp/diff_new_pack.xPQOTg/_new 2020-05-11 17:09:30.183356686 +0200
@@ -48,6 +48,7 @@
</repository>
<packages type="bootstrap">
<package name="nginx"/>
+ <package name="bash"/>
<archive name="entrypoint.tar.gz"/>
<package name="mandoc"/>
<package name="--"/>
++++++ entrypoint.tar.gz ++++++
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 2020-02-19 15:53:40.633718562 +0100
+++ new/usr/local/bin/entrypoint.sh 2020-05-11 14:57:08.633313083 +0200
@@ -14,7 +14,7 @@
create_nginx_htdocs_dir() {
# populate default nginx configuration if it does not exist
- if [ ! -f ${HTDOCS_DIR}/50x.html ]; then
+ if [ ! "$(ls -A $HTDOCS_DIR)" ]; then
echo "Populate ${HTDOCS_DIR}"
cp -a /usr/local/nginx/htdocs/* ${HTDOCS_DIR}/
fi
@@ -35,7 +35,7 @@
# default behaviour is to launch nginx
if [[ -z ${1} ]]; then
echo "Starting nginx..."
- exec /usr/sbin/nginx -g "daemon off;"
+ exec /usr/sbin/nginx -g "daemon off;" ${EXTRA_ARGS}
else
exec "$@"
fi
