Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package containers-systemd for
openSUSE:Factory checked in at 2022-08-12 17:46:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/containers-systemd (Old)
and /work/SRC/openSUSE:Factory/.containers-systemd.new.1521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containers-systemd"
Fri Aug 12 17:46:22 2022 rev:33 rq:994526 version:0.0+git20220811.226e80e
Changes:
--------
--- /work/SRC/openSUSE:Factory/containers-systemd/containers-systemd.changes
2022-07-14 16:33:31.288585634 +0200
+++
/work/SRC/openSUSE:Factory/.containers-systemd.new.1521/containers-systemd.changes
2022-08-12 17:46:27.722087029 +0200
@@ -1,0 +2,7 @@
+Thu Aug 11 12:31:53 UTC 2022 - ku...@suse.com
+
+- Update to version 0.0+git20220811.226e80e:
+ * Add service for cups container
+ * Make sure dhcp container has NET_RAW capabilities
+
+-------------------------------------------------------------------
Old:
----
containers-systemd-0.0+git20220713.967c6f4.tar.xz
New:
----
containers-systemd-0.0+git20220811.226e80e.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ containers-systemd.spec ++++++
--- /var/tmp/diff_new_pack.lcYLzP/_old 2022-08-12 17:46:28.366088639 +0200
+++ /var/tmp/diff_new_pack.lcYLzP/_new 2022-08-12 17:46:28.370088649 +0200
@@ -16,8 +16,8 @@
#
-%define containers bind dhcp-server dovecot fetchmail haproxy mariadb minidlna
nfs-server nginx openldap postfix roundcube samba spamassassin squid wsdd
-%define container_services container-bind.service
container-dhcp-server.service container-dhcp6-server.service
container-dovecot.service container-fetchmail.service container-haproxy.service
container-mariadb.service container-minidlna.service
container-nfs-server.service container-nginx.service container-openldap.service
container-postfix.service container-roundcube.service container-samba.service
container-spamassassin.service container-squid.service container-wsdd.service
container-image-prune.service container-image-prune.timer
container-certbot-renew.service container-certbot-renew.timer
+%define containers bind cups dhcp-server dovecot fetchmail haproxy mariadb
minidlna nfs-server nginx openldap postfix roundcube samba spamassassin squid
wsdd
+%define container_services container-bind.service container-cups.service
container-dhcp-server.service container-dhcp6-server.service
container-dovecot.service container-fetchmail.service container-haproxy.service
container-mariadb.service container-minidlna.service
container-nfs-server.service container-nginx.service container-openldap.service
container-postfix.service container-roundcube.service container-samba.service
container-spamassassin.service container-squid.service container-wsdd.service
container-image-prune.service container-image-prune.timer
container-certbot-renew.service container-certbot-renew.timer
%if %{undefined service_del_postun_without_restart}
%define service_del_postun_without_restart() \
@@ -26,7 +26,7 @@
%endif
Name: containers-systemd
-Version: 0.0+git20220713.967c6f4
+Version: 0.0+git20220811.226e80e
Release: 0
Summary: Systemd service files and config files for openSUSE container
License: MIT
@@ -38,7 +38,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, dovecot, fetchmail, haproxy,
+Currently supported are bind, cups, dhcp-server, dovecot, fetchmail, haproxy,
mariadb, minidlna, nginx, openldap, postfix, roundcube, samba,
spamassassin, squid and wsdd. Additional, there is a timer to cleanup
dangling container images.
@@ -99,6 +99,10 @@
%{_distconfdir}/default/container-bind
%{_sbindir}/rccontainer-bind
%ghost %dir /srv/bind
+%{_unitdir}/container-cups.service
+%{_distconfdir}/default/container-cups
+%{_sbindir}/rccontainer-cups
+%ghost %dir /srv/cups
%{_unitdir}/container-certbot-renew.service
%{_unitdir}/container-certbot-renew.timer
%{_distconfdir}/default/container-certbot
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.lcYLzP/_old 2022-08-12 17:46:28.418088769 +0200
+++ /var/tmp/diff_new_pack.lcYLzP/_new 2022-08-12 17:46:28.422088779 +0200
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/containers-systemd.git</param>
- <param
name="changesrevision">967c6f44d04a09e709610ff6b1317ece8f35b5c6</param></service>
+ <param
name="changesrevision">226e80e333ec80870c58f77e1d8d2942c4725885</param></service>
</servicedata>
(No newline at EOF)
++++++ containers-systemd-0.0+git20220713.967c6f4.tar.xz ->
containers-systemd-0.0+git20220811.226e80e.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/containers-systemd-0.0+git20220713.967c6f4/README.md
new/containers-systemd-0.0+git20220811.226e80e/README.md
--- old/containers-systemd-0.0+git20220713.967c6f4/README.md 2022-07-13
14:09:10.000000000 +0200
+++ new/containers-systemd-0.0+git20220811.226e80e/README.md 2022-08-11
14:31:07.000000000 +0200
@@ -5,6 +5,7 @@
Currently supported are:
* bind
+ * cups
* dhcp-server
* dhcp6-server
* dovecot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220713.967c6f4/container-cups.default
new/containers-systemd-0.0+git20220811.226e80e/container-cups.default
--- old/containers-systemd-0.0+git20220713.967c6f4/container-cups.default
1970-01-01 01:00:00.000000000 +0100
+++ new/containers-systemd-0.0+git20220811.226e80e/container-cups.default
2022-08-11 14:31:07.000000000 +0200
@@ -0,0 +1,13 @@
+# Variables of this file can be overwritten with
+# /etc/default/container-cups
+
+# Name of the image path to pull the cups image from
+CUPS_IMAGE_PATH=registry.opensuse.org/opensuse/cups:latest
+
+# Password for the admin account to login and adjust printer configuration
+CUPS_ADMIN_PASSWORD=""
+
+# Extra arguments for podman to start the container
+# Possible additional entries (multiple are possible):
+# "-v /srv/cups:/etc/cups"
+PODMAN_EXTRA_ARGS=""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220713.967c6f4/container-cups.service
new/containers-systemd-0.0+git20220811.226e80e/container-cups.service
--- old/containers-systemd-0.0+git20220713.967c6f4/container-cups.service
1970-01-01 01:00:00.000000000 +0100
+++ new/containers-systemd-0.0+git20220811.226e80e/container-cups.service
2022-08-11 14:31:07.000000000 +0200
@@ -0,0 +1,25 @@
+[Unit]
+Description=openSUSE cups server container
+Documentation=https://en.opensuse.org/Portal:Container/Image/cups
+After=network-online.target local-fs.target
+Wants=network-online.target
+StartLimitIntervalSec=40
+StartLimitBurst=5
+
+[Service]
+Environment=PODMAN_SYSTEMD_UNIT=%n
+Restart=on-failure
+RestartSec=1s
+TimeoutStopSec=70
+EnvironmentFile=/usr/etc/default/container-cups
+EnvironmentFile=-/etc/default/container-cups
+ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
+ExecStartPre=-/usr/bin/podman pull ${CUPS_IMAGE_PATH}
+ExecStart=/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile
%t/%n.ctr-id --cgroups=no-conmon --sdnotify=conmon --replace -d --rm
$PODMAN_EXTRA_ARGS -p 631:631 -e ADMIN_PASSWORD=${CUPS_ADMIN_PASSWORD} --name
cups ${CUPS_IMAGE_PATH}
+ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10
+ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id
+Type=notify
+NotifyAccess=all
+
+[Install]
+WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220713.967c6f4/container-dhcp-server.service
new/containers-systemd-0.0+git20220811.226e80e/container-dhcp-server.service
---
old/containers-systemd-0.0+git20220713.967c6f4/container-dhcp-server.service
2022-07-13 14:09:10.000000000 +0200
+++
new/containers-systemd-0.0+git20220811.226e80e/container-dhcp-server.service
2022-08-11 14:31:07.000000000 +0200
@@ -16,7 +16,7 @@
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/mkdir -p ${CONFIG_DIR}
ExecStartPre=-/usr/bin/podman pull ${DHCPD_IMAGE_PATH}
-ExecStart=/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile
%t/%n.ctr-id --cgroups=no-conmon --sdnotify=conmon --replace -d --rm
$PODMAN_EXTRA_ARGS -v ${CONFIG_DIR}:/data:z --net=host --name dhcp-server --env
DHCPD_IP_PROTOCOL=4 --env DHCPD_INTERFACES=${DHCPD_INTERFACES}
${DHCPD_IMAGE_PATH}
+ExecStart=/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile
%t/%n.ctr-id --cgroups=no-conmon --sdnotify=conmon --replace -d --rm
$PODMAN_EXTRA_ARGS -v ${CONFIG_DIR}:/data:z --net=host --cap-add cap_net_raw
--name dhcp-server --env DHCPD_IP_PROTOCOL=4 --env
DHCPD_INTERFACES=${DHCPD_INTERFACES} ${DHCPD_IMAGE_PATH}
ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.ctr-id -t 10
ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.ctr-id
Type=notify
