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-14 10:11:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opensuse-nginx-image (Old)
and /work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opensuse-nginx-image"
Wed Apr 14 10:11:34 2021 rev:9 rq:885256 version:1.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/opensuse-nginx-image/opensuse-nginx-image.changes
2020-06-06 08:13:25.772640593 +0200
+++
/work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.2401/opensuse-nginx-image.changes
2021-04-14 10:12:04.081604013 +0200
@@ -1,0 +2,21 @@
+Wed Apr 14 06:23:28 UTC 2021 - Thorsten Kukuk <ku...@suse.com>
+
+- Remove unused /data volume
+
+-------------------------------------------------------------------
+Tue Apr 13 21:15:38 UTC 2021 - Thorsten Kukuk <ku...@suse.com>
+
+- Add certificates and timezone database
+
+-------------------------------------------------------------------
+Tue Apr 13 19:46:23 UTC 2021 - Thorsten Kukuk <ku...@suse.com>
+
+- Fix cleaning up of /etc/nginx at build time
+
+-------------------------------------------------------------------
+Tue Apr 13 19:02:39 UTC 2021 - Thorsten Kukuk <ku...@suse.com>
+
+- Split entrypoing.sh in parts and introduce /docker-entrypoint.d
+ following nginx upstream.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-nginx-image.kiwi ++++++
--- /var/tmp/diff_new_pack.KdZteI/_old 2021-04-14 10:12:04.641604958 +0200
+++ /var/tmp/diff_new_pack.KdZteI/_new 2021-04-14 10:12:04.641604958 +0200
@@ -23,9 +23,6 @@
<port number='80/tcp'/>
<port number='443/tcp'/>
</expose>
- <volumes>
- <volume name="/data"/>
- </volumes>
<labels>
<suse_label_helper:add_prefix prefix="org.opensuse.nginx">
<label name="org.opencontainers.image.title" value="openSUSE nginx
web server container"/>
@@ -49,6 +46,10 @@
<packages type="bootstrap">
<package name="nginx"/>
<package name="bash"/>
+ <package name="ca-certificates"/>
+ <package name="ca-certificates-mozilla"/>
+ <package name="-busybox-findutils"/>
+ <package name="timezone"/>
<archive name="entrypoint.tar.gz"/>
<package name="mandoc"/>
<package name="-busybox-man"/>
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.KdZteI/_old 2021-04-14 10:12:04.697605052 +0200
+++ /var/tmp/diff_new_pack.KdZteI/_new 2021-04-14 10:12:04.697605052 +0200
@@ -15,7 +15,7 @@
# Create fallback backp of default config files and data
mkdir -p /usr/local/nginx/etc
cp -av /etc/nginx/* /usr/local/nginx/etc/
-rm /etc/nginx/*.default
+rm /etc/nginx/*
rm /usr/local/nginx/etc/*.default
mkdir -p /usr/local/nginx/htdocs
cp -av /srv/www/htdocs/* /usr/local/nginx/htdocs
++++++ 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 1970-01-01 01:00:00.000000000
+0100
+++ new/docker-entrypoint.d/30-populate-etc.sh 2021-04-13 20:57:07.947825181
+0200
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+ETC_DIR=/etc/nginx
+
+# populate default nginx configuration if it does not exist
+if [ ! -f ${ETC_DIR}/nginx.conf ]; then
+ echo "Populate ${ETC_DIR}"
+ cp -a /usr/local/nginx/etc/* ${ETC_DIR}/
+fi
+
+exit 0
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 1970-01-01
01:00:00.000000000 +0100
+++ new/docker-entrypoint.d/40-populate-htdocs.sh 2021-04-13
20:58:21.307632212 +0200
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+HTDOCS_DIR=/srv/www/htdocs
+
+# populate default nginx configuration if it does not exist
+if [ ! "$(ls -A $HTDOCS_DIR)" ]; then
+ echo "Populate ${HTDOCS_DIR}"
+ cp -a /usr/local/nginx/htdocs/* ${HTDOCS_DIR}/
+fi
+
+exit 0
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-05-11 14:57:08.633313083 +0200
+++ new/usr/local/bin/entrypoint.sh 2021-04-13 21:01:52.583076421 +0200
@@ -1,27 +1,29 @@
#!/bin/bash
set -e
-ETC_DIR=/etc/nginx
-HTDOCS_DIR=/srv/www/htdocs
+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"
-create_nginx_etc_dir() {
- # populate default nginx configuration if it does not exist
- if [ ! -f ${ETC_DIR}/nginx.conf ]; then
- echo "Populate ${ETC_DIR}"
- cp -a /usr/local/nginx/etc/* ${ETC_DIR}/
- fi
-}
+ echo "$0: 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";
+ "$f"
+ else
+ # warn on shell scripts without exec bit
+ echo "$0: Ignoring $f, not executable";
+ fi
+ ;;
+ *) echo "$0: Ignoring $f";;
+ esac
+ done
-create_nginx_htdocs_dir() {
- # populate default nginx configuration if it does not exist
- if [ ! "$(ls -A $HTDOCS_DIR)" ]; then
- echo "Populate ${HTDOCS_DIR}"
- cp -a /usr/local/nginx/htdocs/* ${HTDOCS_DIR}/
- fi
-}
-
-create_nginx_etc_dir
-create_nginx_htdocs_dir
+ echo "$0: Configuration complete; ready for start up"
+else
+ echo "$0: No files found in /docker-entrypoint.d/, skipping configuration"
+fi
# allow arguments to be passed to nginx
if [[ ${1:0:1} = '-' ]]; then
