Hello community,
here is the log from the commit of package containers-systemd for
openSUSE:Factory checked in at 2020-01-22 22:45:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/containers-systemd (Old)
and /work/SRC/openSUSE:Factory/.containers-systemd.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containers-systemd"
Wed Jan 22 22:45:55 2020 rev:4 rq:766256 version:0.0+git20200122.8276c03
Changes:
--------
--- /work/SRC/openSUSE:Factory/containers-systemd/containers-systemd.changes
2020-01-18 12:18:51.759162447 +0100
+++
/work/SRC/openSUSE:Factory/.containers-systemd.new.26092/containers-systemd.changes
2020-01-22 22:46:10.736572850 +0100
@@ -1,0 +2,6 @@
+Wed Jan 22 10:55:04 UTC 2020 - ku...@suse.com
+
+- Update to version 0.0+git20200122.8276c03:
+ * Add support for nginx container
+
+-------------------------------------------------------------------
Old:
----
containers-systemd-0.0+git20200116.87baa97.tar.xz
New:
----
containers-systemd-0.0+git20200122.8276c03.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ containers-systemd.spec ++++++
--- /var/tmp/diff_new_pack.fvgtUT/_old 2020-01-22 22:46:11.616573294 +0100
+++ /var/tmp/diff_new_pack.fvgtUT/_new 2020-01-22 22:46:11.616573294 +0100
@@ -16,11 +16,11 @@
#
-%define containers bind dhcp-server mariadb
-%define container_services container-bind.service
container-dhcp-server.service container-dhcp6-server.service
container-mariadb.service
+%define containers bind dhcp-server mariadb nginx
+%define container_services container-bind.service
container-dhcp-server.service container-dhcp6-server.service
container-mariadb.service container-nginx.service
Name: containers-systemd
-Version: 0.0+git20200116.87baa97
+Version: 0.0+git20200122.8276c03
Release: 0
Summary: Systemd service files and config files for openSUSE container
License: MIT
@@ -33,7 +33,7 @@
%description
This package contains the configuration files and systemd units
to run the openSUSE containers via podman managed by systemd.
-Currently supported are bind, dhcp-server and mariadb.
+Currently supported are bind, dhcp-server, mariadb and nginx.
%prep
%setup -q
@@ -97,5 +97,9 @@
%config(noreplace) %attr(0600,root,root)
%{_sysconfdir}/mariadb-secrets/MYSQL_DATABASE
%config(noreplace) %attr(0600,root,root)
%{_sysconfdir}/mariadb-secrets/MYSQL_USER
%config(noreplace) %attr(0600,root,root)
%{_sysconfdir}/mariadb-secrets/MYSQL_PASSWORD
+%{_unitdir}/container-nginx.service
+%{_fillupdir}/sysconfig.container-nginx
+%{_sbindir}/rccontainer-nginx
+%ghost %dir /srv/nginx
%changelog
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.fvgtUT/_old 2020-01-22 22:46:11.664573318 +0100
+++ /var/tmp/diff_new_pack.fvgtUT/_new 2020-01-22 22:46:11.664573318 +0100
@@ -1,5 +1,5 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://github.com/kubic-project/containers-systemd.git</param>
- <param
name="changesrevision">87baa97d35dc9a9291197d0124fe5973a04faf6e</param></service>
+ <param
name="changesrevision">8276c034365a8059659d339f814d37211435d823</param></service>
</servicedata>
\ No newline at end of file
++++++ containers-systemd-0.0+git20200116.87baa97.tar.xz ->
containers-systemd-0.0+git20200122.8276c03.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/containers-systemd-0.0+git20200116.87baa97/README.md
new/containers-systemd-0.0+git20200122.8276c03/README.md
--- old/containers-systemd-0.0+git20200116.87baa97/README.md 2020-01-16
15:24:23.000000000 +0100
+++ new/containers-systemd-0.0+git20200122.8276c03/README.md 2020-01-22
11:46:29.000000000 +0100
@@ -8,6 +8,7 @@
* dhcp-server
* dhcp6-server
* mariadb
+ * nginx
## bind
@@ -26,3 +27,7 @@
* ${SECRETS_DIR}/MYSQL_DATABASE
* ${SECRETS_DIR}/MYSQL_USER
* ${SECRETS_DIR}/MYSQL_PASSWORD
+
+## nginx
+
+ * /etc/sysconfig/container-nginx contains generic settings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20200116.87baa97/container-nginx.service
new/containers-systemd-0.0+git20200122.8276c03/container-nginx.service
--- old/containers-systemd-0.0+git20200116.87baa97/container-nginx.service
1970-01-01 01:00:00.000000000 +0100
+++ new/containers-systemd-0.0+git20200122.8276c03/container-nginx.service
2020-01-22 11:46:29.000000000 +0100
@@ -0,0 +1,18 @@
+[Unit]
+Description=openSUSE nginx container
+Documentation=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-nginx-image
+After=network-online.target
+
+[Service]
+TimeoutStartSec=0
+Restart=always
+EnvironmentFile=/etc/sysconfig/container-nginx
+ExecStartPre=-/usr/bin/mkdir -p ${CONFIG_DIR}
+ExecStartPre=-/usr/bin/podman stop nginx
+ExecStartPre=-/usr/bin/podman rm nginx
+ExecStartPre=-/usr/bin/podman pull ${NGINX_IMAGE_PATH}
+ExecStart=/usr/bin/podman run --rm -v ${CONFIG_DIR}:/data -p 53:53/tcp -p
443:443/tcp --name nginx ${NGINX_IMAGE_PATH}
+ExecStop=/usr/bin/podman stop -t 2 nginx
+
+[Install]
+WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20200116.87baa97/sysconfig.container-nginx
new/containers-systemd-0.0+git20200122.8276c03/sysconfig.container-nginx
--- old/containers-systemd-0.0+git20200116.87baa97/sysconfig.container-nginx
1970-01-01 01:00:00.000000000 +0100
+++ new/containers-systemd-0.0+git20200122.8276c03/sysconfig.container-nginx
2020-01-22 11:46:29.000000000 +0100
@@ -0,0 +1,14 @@
+## Path: Container/nginx
+## Description: Settings for nginx container
+## Type: string
+## Default: "registry.opensuse.org/opensuse/nginx:latest"
+#
+# Name of the image path to pull the nginx image from
+BIND_IMAGE_PATH=registry.opensuse.org/opensuse/nginxlatest
+
+## Type: string
+## Default: "/srv/nginx"
+#
+# Name of the path where the configuration and web pages will be stored
+CONFIG_DIR="/srv/nginx"
+
