commit opensuse-nginx-image for openSUSE:Factory
Hello community, here is the log from the commit of package opensuse-nginx-image for openSUSE:Factory checked in at 2020-02-10 21:54:48 Comparing /work/SRC/openSUSE:Factory/opensuse-nginx-image (Old) and /work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.26092 (New) Package is "opensuse-nginx-image" Mon Feb 10 21:54:48 2020 rev:2 rq:772650 version:1.0.0 Changes: --- /work/SRC/openSUSE:Factory/opensuse-nginx-image/opensuse-nginx-image.changes 2020-01-22 22:43:49.360501664 +0100 +++ /work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.26092/opensuse-nginx-image.changes 2020-02-10 21:54:54.818240415 +0100 @@ -1,0 +2,5 @@ +Sun Feb 9 00:43:37 UTC 2020 - Richard Brown + +- Fix README errata + +--- Other differences: -- ++ README ++ --- /var/tmp/diff_new_pack.CyxNDE/_old 2020-02-10 21:54:55.278240669 +0100 +++ /var/tmp/diff_new_pack.CyxNDE/_new 2020-02-10 21:54:55.282240672 +0100 @@ -3,4 +3,4 @@ podman run -d --rm -v /srv/nginx:/data --name nginx -p 80:80/tcp -p 443:443/tcp registry.opensuse.org/opensuse/nginx Configuration files should be stored in /srv/nginx/etc -Webpages should be stored in /srv/nginx/data +Webpages should be stored in /srv/nginx/htdocs
commit opensuse-nginx-image for openSUSE:Factory
Hello community,
here is the log from the commit of package opensuse-nginx-image for
openSUSE:Factory checked in at 2020-02-25 16:05:41
Comparing /work/SRC/openSUSE:Factory/opensuse-nginx-image (Old)
and /work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.26092 (New)
Package is "opensuse-nginx-image"
Tue Feb 25 16:05:41 2020 rev:4 rq:778899 version:1.0.0
Changes:
---
/work/SRC/openSUSE:Factory/opensuse-nginx-image/opensuse-nginx-image.changes
2020-02-20 14:56:02.166365263 +0100
+++
/work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.26092/opensuse-nginx-image.changes
2020-02-25 16:06:08.580482538 +0100
@@ -1,0 +2,5 @@
+Mon Feb 24 20:37:16 UTC 2020 - Thorsten Kukuk
+
+- Add demo index.html
+
+---
Other differences:
--
++ entrypoint.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/srv/www/htdocs/index.html
new/srv/www/htdocs/index.html
--- old/srv/www/htdocs/index.html 1970-01-01 01:00:00.0 +0100
+++ new/srv/www/htdocs/index.html 2020-02-24 21:36:58.529470454 +0100
@@ -0,0 +1,18 @@
+
+
+
+Welcome to nginx!
+
+body {
+width: 35em;
+margin: 0 auto;
+font-family: Tahoma, Verdana, Arial, sans-serif;
+}
+
+
+
+Welcome to nginx!
+If you see this page, the container with the nginx web server is
+successfully installed and working.
+
+
commit opensuse-nginx-image for openSUSE:Factory
Hello community, here is the log from the commit of package opensuse-nginx-image for openSUSE:Factory checked in at 2020-02-27 16:57:37 Comparing /work/SRC/openSUSE:Factory/opensuse-nginx-image (Old) and /work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.26092 (New) Package is "opensuse-nginx-image" Thu Feb 27 16:57:37 2020 rev:5 rq:779955 version:1.0.0 Changes: --- /work/SRC/openSUSE:Factory/opensuse-nginx-image/opensuse-nginx-image.changes 2020-02-25 16:06:08.580482538 +0100 +++ /work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.26092/opensuse-nginx-image.changes 2020-02-27 16:57:41.250842608 +0100 @@ -1,0 +2,6 @@ +Thu Feb 27 10:34:45 UTC 2020 - Thorsten Kukuk + +- Redirect access.log to stdout +- Redirect error.log to stderr + +--- Other differences: -- ++ config.sh ++ --- /var/tmp/diff_new_pack.gDzF85/_old 2020-02-27 16:57:41.782843497 +0100 +++ /var/tmp/diff_new_pack.gDzF85/_new 2020-02-27 16:57:41.782843497 +0100 @@ -8,6 +8,11 @@ #-- echo "Configure image: [$kiwi_iname]..." +# Log to stdout/stderr +ln -sf /dev/stdout /var/log/nginx/access.log +ln -sf /dev/stderr /var/log/nginx/error.log + +# 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
commit opensuse-nginx-image for openSUSE:Factory
Hello community,
here is the log from the commit of package opensuse-nginx-image for
openSUSE:Factory checked in at 2020-02-20 14:55:50
Comparing /work/SRC/openSUSE:Factory/opensuse-nginx-image (Old)
and /work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.26092 (New)
Package is "opensuse-nginx-image"
Thu Feb 20 14:55:50 2020 rev:3 rq:777383 version:1.0.0
Changes:
---
/work/SRC/openSUSE:Factory/opensuse-nginx-image/opensuse-nginx-image.changes
2020-02-10 21:54:54.818240415 +0100
+++
/work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.26092/opensuse-nginx-image.changes
2020-02-20 14:56:02.166365263 +0100
@@ -1,0 +2,11 @@
+Wed Feb 19 15:01:55 UTC 2020 - Thorsten Kukuk
+
+- Adjust config.sh
+
+---
+Wed Feb 19 12:10:53 UTC 2020 - Thorsten Kukuk
+
+- Change handling of /etc/nginx: allow to only mount nginx.conf
+- Mount htdocs to /srv/www/htdocs and not /data/htdocs
+
+---
@@ -4,0 +16,5 @@
+
+---
+Thu Jan 23 15:24:44 UTC 2020 - Thorsten Kukuk
+
+- Replace busybox man/groff with mandoc
New:
config.sh
Other differences:
--
++ opensuse-nginx-image.kiwi ++
--- /var/tmp/diff_new_pack.ctnaqS/_old 2020-02-20 14:56:04.138369133 +0100
+++ /var/tmp/diff_new_pack.ctnaqS/_new 2020-02-20 14:56:04.142369140 +0100
@@ -48,7 +48,7 @@
-
+
++ README ++
--- /var/tmp/diff_new_pack.ctnaqS/_old 2020-02-20 14:56:04.434369714 +0100
+++ /var/tmp/diff_new_pack.ctnaqS/_new 2020-02-20 14:56:04.434369714 +0100
@@ -1,6 +1,9 @@
The command to run this container is:
-podman run -d --rm -v /srv/nginx:/data --name nginx -p 80:80/tcp -p
443:443/tcp registry.opensuse.org/opensuse/nginx
+podman run -d --rm -v /srv/nginx/etc:/etc/nginx -v
/srv/nginx/htdocs:/srv/www/htdocs --name nginx -p 80:80/tcp -p 443:443/tcp
registry.opensuse.org/opensuse/nginx
Configuration files should be stored in /srv/nginx/etc
Webpages should be stored in /srv/nginx/htdocs
+
+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
++ config.sh ++
#!/bin/sh
#--
#test -f /.profile && . /.profile
#==
# Greeting...
#--
echo "Configure image: [$kiwi_iname]..."
mkdir -p /usr/local/nginx/etc
cp -av /etc/nginx/* /usr/local/nginx/etc/
rm /etc/nginx/*.default
rm /usr/local/nginx/etc/*.default
mkdir -p /usr/local/nginx/htdocs
cp -av /srv/www/htdocs/* /usr/local/nginx/htdocs
exit 0
++ 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-01-21 21:07:05.481264386 +0100
+++ new/usr/local/bin/entrypoint.sh 2020-02-19 15:53:40.633718562 +0100
@@ -1,28 +1,27 @@
#!/bin/bash
set -e
-set -x
-DATA_DIR=/data
+ETC_DIR=/etc/nginx
+HTDOCS_DIR=/srv/www/htdocs
-create_nginx_data_dir() {
- mkdir -p ${DATA_DIR}
-
- # populate default nginx configuration if it does not exist
- if [ ! -d ${DATA_DIR}/etc ]; then
- mkdir ${DATA_DIR}/etc
- mv /etc/nginx/* ${DATA_DIR}/etc/
- fi
- rm -rf /etc/nginx
- ln -sf ${DATA_DIR}/etc /etc/nginx
+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
+}
- if [ ! -d ${DATA_DIR}/htdocs ]; then
-mv /srv/www/htdocs ${DATA_DIR}/
- fi
- rm -rf /srv/www/htdocs
- ln -sf ${DATA_DIR}/htdocs /srv/www/
+create_nginx_htdocs_dir() {
+# populate default nginx configuration if it does not exist
+if [ ! -f ${HTDOCS_DIR}/50x.html ]; then
+ echo "Populate ${HTDOCS_DIR}"
+ cp -a /usr/local/nginx/htdocs/* ${HTDOCS_DIR}/
+fi
}
-create_nginx_data_dir
+create_nginx_etc_dir
+create_nginx_htdocs_dir
# allow arguments to be passed to nginx
if [[ ${1:0:1} = '-' ]]; then
commit opensuse-nginx-image for openSUSE:Factory
Hello community, here is the log from the commit of package opensuse-nginx-image for openSUSE:Factory checked in at 2020-05-09 22:19:20 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" Sat May 9 22:19:20 2020 rev:6 rq:794942 version:1.0.0 Changes: --- /work/SRC/openSUSE:Factory/opensuse-nginx-image/opensuse-nginx-image.changes 2020-02-27 16:57:41.250842608 +0100 +++ /work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.2738/opensuse-nginx-image.changes 2020-05-09 22:19:25.899617823 +0200 @@ -1,0 +2,5 @@ +Fri Apr 17 13:34:26 UTC 2020 - Thorsten Kukuk + +- Use mandoc instead of busybox man + +--- Other differences: -- ++ opensuse-nginx-image.kiwi ++ --- /var/tmp/diff_new_pack.WTsERT/_old 2020-05-09 22:19:26.587617393 +0200 +++ /var/tmp/diff_new_pack.WTsERT/_new 2020-05-09 22:19:26.587617393 +0200 @@ -48,7 +48,9 @@ - + + +
commit opensuse-nginx-image for openSUSE:Factory
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
+
+- Only install default htdocs if htdocs directory is totally empty
+
+---
+Mon May 11 11:45:43 UTC 2020 - Thorsten Kukuk
+
+- 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 @@
+
++ 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
commit opensuse-nginx-image for openSUSE:Factory
Hello community, here is the log from the commit of package opensuse-nginx-image for openSUSE:Factory checked in at 2020-06-06 08:13:24 Comparing /work/SRC/openSUSE:Factory/opensuse-nginx-image (Old) and /work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.3606 (New) Package is "opensuse-nginx-image" Sat Jun 6 08:13:24 2020 rev:8 rq:811767 version:1.0.0 Changes: --- /work/SRC/openSUSE:Factory/opensuse-nginx-image/opensuse-nginx-image.changes 2020-05-11 17:09:29.415353653 +0200 +++ /work/SRC/openSUSE:Factory/.opensuse-nginx-image.new.3606/opensuse-nginx-image.changes 2020-06-06 08:13:25.772640593 +0200 @@ -1,0 +2,6 @@ +Fri Jun 5 10:48:12 UTC 2020 - Dominique Leuenberger + +- Remove "--" from the package list to separate pkgs from + arguments: kiwi does this implicit now. + +--- Other differences: -- ++ opensuse-nginx-image.kiwi ++ --- /var/tmp/diff_new_pack.dV0m9f/_old 2020-06-06 08:13:26.460642728 +0200 +++ /var/tmp/diff_new_pack.dV0m9f/_new 2020-06-06 08:13:26.464642740 +0200 @@ -51,7 +51,6 @@ -
