Accepting request 802689 from devel:kubic:containers

- Only install default htdocs if htdocs directory is totally empty

- Add bash as it is required by entrypoint script
- Fix EXTRA_ARGS handling

OBS-URL: https://build.opensuse.org/request/show/802689
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-nginx-image?expand=0&rev=7

opensuse-nginx-image.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon May 11 12:58:26 UTC 2020 - Richard Brown <rbrown@suse.com>
+
+- Only install default htdocs if htdocs directory is totally empty
+
+-------------------------------------------------------------------
+Mon May 11 11:45:43 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
+
+- Add bash as it is required by entrypoint script
+- Fix EXTRA_ARGS handling
+
 -------------------------------------------------------------------
 Fri Apr 17 13:34:26 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
 

opensuse-nginx-image.kiwi

@@ -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

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f77d5175362e9f815afd95966a2fea51d3aee41d24e971a03f18ddf491abf5fd
-size 1294
+oid sha256:4ff141e9c0a2edf705ee1c8c86175a1111e8b9bc60787f6c05fcd511b5ab82b0
+size 1287