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-07-07 12:56:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/containers-systemd (Old)
and /work/SRC/openSUSE:Factory/.containers-systemd.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containers-systemd"
Thu Jul 7 12:56:13 2022 rev:30 rq:986984 version:0.0+git20220706.2c928fe
Changes:
--------
--- /work/SRC/openSUSE:Factory/containers-systemd/containers-systemd.changes
2022-06-29 16:01:43.632652170 +0200
+++
/work/SRC/openSUSE:Factory/.containers-systemd.new.1523/containers-systemd.changes
2022-07-07 12:56:25.759239757 +0200
@@ -1,0 +2,6 @@
+Wed Jul 06 08:14:35 UTC 2022 - ku...@suse.com
+
+- Update to version 0.0+git20220706.2c928fe:
+ * Fix partly missing SELinux support (#5), call podman directly
+
+-------------------------------------------------------------------
Old:
----
containers-systemd-0.0+git20220628.ee9e63c.tar.xz
New:
----
containers-systemd-0.0+git20220706.2c928fe.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ containers-systemd.spec ++++++
--- /var/tmp/diff_new_pack.K7VYnz/_old 2022-07-07 12:56:26.235240465 +0200
+++ /var/tmp/diff_new_pack.K7VYnz/_new 2022-07-07 12:56:26.239240472 +0200
@@ -26,7 +26,7 @@
%endif
Name: containers-systemd
-Version: 0.0+git20220628.ee9e63c
+Version: 0.0+git20220706.2c928fe
Release: 0
Summary: Systemd service files and config files for openSUSE container
License: MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.K7VYnz/_old 2022-07-07 12:56:26.267240513 +0200
+++ /var/tmp/diff_new_pack.K7VYnz/_new 2022-07-07 12:56:26.271240519 +0200
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/containers-systemd.git</param>
- <param
name="changesrevision">ee9e63cfe22480abcec46f37d7c181a8ee874119</param></service>
+ <param
name="changesrevision">2c928fecd7ec0d38c23635fd338afa551752834e</param></service>
</servicedata>
(No newline at EOF)
++++++ containers-systemd-0.0+git20220628.ee9e63c.tar.xz ->
containers-systemd-0.0+git20220706.2c928fe.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-bind.service
new/containers-systemd-0.0+git20220706.2c928fe/container-bind.service
--- old/containers-systemd-0.0+git20220628.ee9e63c/container-bind.service
2022-06-28 11:12:23.000000000 +0200
+++ new/containers-systemd-0.0+git20220706.2c928fe/container-bind.service
2022-07-06 10:08:30.000000000 +0200
@@ -14,8 +14,9 @@
EnvironmentFile=/usr/etc/default/container-bind
EnvironmentFile=-/etc/default/container-bind
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
+ExecStartPre=-/usr/bin/mkdir ${CONFIG_DIR}
ExecStartPre=-/usr/bin/podman pull ${BIND_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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 ${BIND_PORTS} --name bind
${BIND_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 $BIND_PORTS --name bind
${BIND_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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-certbot-renew.service
new/containers-systemd-0.0+git20220706.2c928fe/container-certbot-renew.service
---
old/containers-systemd-0.0+git20220628.ee9e63c/container-certbot-renew.service
2022-06-28 11:12:23.000000000 +0200
+++
new/containers-systemd-0.0+git20220706.2c928fe/container-certbot-renew.service
2022-07-06 10:08:30.000000000 +0200
@@ -15,7 +15,7 @@
EnvironmentFile=-/etc/default/container-certbot
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${CERTBOT_IMAGE_PATH}
-ExecStartPre=-mkdir -p $CONFIG_DIR $VAR_DIR $LOG_DIR
+ExecStartPre=-/usr/bin/mkdir -p $CONFIG_DIR $VAR_DIR $LOG_DIR
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}:/etc/letsencrypt:z -v
${VAR_DIR}:/var/lib/letsencrypt:z -v ${LOG_DIR}:/var/log/letsencrypt:z
$CERTBOT_PORTS --name certbot ${CERTBOT_IMAGE_PATH} renew --standalone
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-dhcp-server.service
new/containers-systemd-0.0+git20220706.2c928fe/container-dhcp-server.service
---
old/containers-systemd-0.0+git20220628.ee9e63c/container-dhcp-server.service
2022-06-28 11:12:23.000000000 +0200
+++
new/containers-systemd-0.0+git20220706.2c928fe/container-dhcp-server.service
2022-07-06 10:08:30.000000000 +0200
@@ -14,8 +14,9 @@
EnvironmentFile=/usr/etc/default/container-dhcp-server
EnvironmentFile=-/etc/default/container-dhcp-server
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=/bin/sh -c "/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 --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 --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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-dhcp6-server.service
new/containers-systemd-0.0+git20220706.2c928fe/container-dhcp6-server.service
---
old/containers-systemd-0.0+git20220628.ee9e63c/container-dhcp6-server.service
2022-06-28 11:12:23.000000000 +0200
+++
new/containers-systemd-0.0+git20220706.2c928fe/container-dhcp6-server.service
2022-07-06 10:08:30.000000000 +0200
@@ -16,7 +16,7 @@
ExecStartPre=-/usr/bin/mkdir -p ${CONFIG_DIR}
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${DHCPD_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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 --net=host --name dhcp6-server
--env DHCPD_IP_PROTOCOL=6 --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 --name dhcp6-server
--env DHCPD_IP_PROTOCOL=6 --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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-dovecot.service
new/containers-systemd-0.0+git20220706.2c928fe/container-dovecot.service
--- old/containers-systemd-0.0+git20220628.ee9e63c/container-dovecot.service
2022-06-28 11:12:23.000000000 +0200
+++ new/containers-systemd-0.0+git20220706.2c928fe/container-dovecot.service
2022-07-06 10:08:30.000000000 +0200
@@ -16,7 +16,7 @@
ExecStartPre=-/usr/bin/mkdir -p ${DOVECOT_CERTS_DIR} ${DOVECOT_VMAIL_DIR}
${EXTRA_PKI_DIR}
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${DOVECOT_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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 ${DOVECOT_VMAIL_DIR}:/var/spool/vmail:z -v
${DOVECOT_CERTS_DIR}:/etc/certs:z -v ${EXTRA_PKI_DIR}:/etc/pki:z -v
${SECRETS_DIR}:/etc/dovecot-secrets:Z ${DOVECOT_PORTS} -e
USE_VMAIL_USER=${USE_VMAIL_USER} -e VMAIL_UID=${VMAIL_UID} -e
USE_LDAP=${USE_LDAP} -e LDAP_HOSTS=${LDAP_HOSTS} -e
LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_BIND_DN=${LDAP_BIND_DN} -e
LDAP_BIND_PASSWORD_FILE=${LDAP_BIND_PASSWORD_FILE} -e
LDAP_USE_TLS=${LDAP_USE_TLS} -e DOVECOT_TLS_CRT=${DOVECOT_TLS_CRT} -e
DOVECOT_TLS_KEY=${DOVECOT_TLS_KEY} -e DOVECOT_TLS_CA_CRT=${DOVECOT_TLS_CA_CRT}
-e DOVECOT_TLS_CA_KEY=${DOVECOT_TLS_CA_KEY} -e ENABLE_IMAP=${ENABLE_IMAP} -e
ENABLE_POP3=${ENABLE_POP3} -e ENABLE_LMTP=${ENABLE_LMTP} -e
ENABLE_MANAGESIEVE=${ENABLE_MANAGESIEVE} -e DEBUG=${DEBUG} -e TZ=${TZ} --name
dovecot ${DOVECOT_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 ${DOVECOT_VMAIL_DIR}:/var/spool/vmail:z -v
${DOVECOT_CERTS_DIR}:/etc/certs:z -v ${EXTRA_PKI_DIR}:/etc/pki:z -v
${SECRETS_DIR}:/etc/dovecot-secrets:Z $DOVECOT_PORTS -e
USE_VMAIL_USER=${USE_VMAIL_USER} -e VMAIL_UID=${VMAIL_UID} -e
USE_LDAP=${USE_LDAP} -e LDAP_HOSTS=${LDAP_HOSTS} -e
LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_BIND_DN=${LDAP_BIND_DN} -e
LDAP_BIND_PASSWORD_FILE=${LDAP_BIND_PASSWORD_FILE} -e
LDAP_USE_TLS=${LDAP_USE_TLS} -e DOVECOT_TLS_CRT=${DOVECOT_TLS_CRT} -e
DOVECOT_TLS_KEY=${DOVECOT_TLS_KEY} -e DOVECOT_TLS_CA_CRT=${DOVECOT_TLS_CA_CRT}
-e DOVECOT_TLS_CA_KEY=${DOVECOT_TLS_CA_KEY} -e ENABLE_IMAP=${ENABLE_IMAP} -e
ENABLE_POP3=${ENABLE_POP3} -e ENABLE_LMTP=${ENABLE_LMTP} -e
ENABLE_MANAGESIEVE=${ENABLE_MANAGESIEVE} -e DEBUG=${DEBUG} -e TZ=${TZ} --name
dovecot ${DOVECOT_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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-fetchmail.service
new/containers-systemd-0.0+git20220706.2c928fe/container-fetchmail.service
--- old/containers-systemd-0.0+git20220628.ee9e63c/container-fetchmail.service
2022-06-28 11:12:23.000000000 +0200
+++ new/containers-systemd-0.0+git20220706.2c928fe/container-fetchmail.service
2022-07-06 10:08:30.000000000 +0200
@@ -15,7 +15,7 @@
EnvironmentFile=-/etc/default/container-fetchmail
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${FETCHMAIL_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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 ${FETCHMAILRC}:/etc/fetchmailrc:ro -e
POLLING_INTERVAL=${POLLING_INTERVAL} -e FETCHALL=${FETCHALL} -e
SILENT=${SILENT} -e SMTP_HOSTS=${SMTP_HOSTS} -e DEBUG=${DEBUG} -e TZ=${TZ}
--name fetchmail ${FETCHMAIL_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 ${FETCHMAILRC}:/etc/fetchmailrc:ro -e
POLLING_INTERVAL=${POLLING_INTERVAL} -e FETCHALL=${FETCHALL} -e
SILENT=${SILENT} -e SMTP_HOSTS=${SMTP_HOSTS} -e DEBUG=${DEBUG} -e TZ=${TZ}
--name fetchmail ${FETCHMAIL_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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-haproxy.service
new/containers-systemd-0.0+git20220706.2c928fe/container-haproxy.service
--- old/containers-systemd-0.0+git20220628.ee9e63c/container-haproxy.service
2022-06-28 11:12:23.000000000 +0200
+++ new/containers-systemd-0.0+git20220706.2c928fe/container-haproxy.service
2022-07-06 10:08:30.000000000 +0200
@@ -15,7 +15,7 @@
EnvironmentFile=-/etc/default/container-haproxy
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${HAPROXY_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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_FILE}:/etc/haproxy/haproxy.cfg:ro --net=host
--name haproxy ${HAPROXY_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_FILE}:/etc/haproxy/haproxy.cfg:ro --net=host
--name haproxy ${HAPROXY_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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-mariadb.service
new/containers-systemd-0.0+git20220706.2c928fe/container-mariadb.service
--- old/containers-systemd-0.0+git20220628.ee9e63c/container-mariadb.service
2022-06-28 11:12:23.000000000 +0200
+++ new/containers-systemd-0.0+git20220706.2c928fe/container-mariadb.service
2022-07-06 10:08:30.000000000 +0200
@@ -16,7 +16,7 @@
ExecStartPre=-/usr/bin/mkdir -p ${DATA_DIR}
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${MARIADB_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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 ${DATA_DIR}:/var/lib/mysql -v
${SECRETS_DIR}:/etc/mariadb-secrets -p 3306:3306 --env
MYSQL_ROOT_PASSWORD_FILE=/etc/mariadb-secrets/MYSQL_ROOT_PASSWORD --env
MYSQL_ROOT_HOST_FILE=/etc/mariadb-secrets/MYSQL_ROOT_HOST --env
MYSQL_DATABASE_FILE=/etc/mariadb-secrets/MYSQL_DATABASE --env
MYSQL_USER_FILE=/etc/mariadb-secrets/MYSQL_USER --env
MYSQL_PASSWORD_FILE=/etc/mariadb-secrets/MYSQL_PASSWORD --name mariadb
${MARIADB_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 ${DATA_DIR}:/var/lib/mysql:Z -v
${SECRETS_DIR}:/etc/mariadb-secrets:z -p 3306:3306 --env
MYSQL_ROOT_PASSWORD_FILE=/etc/mariadb-secrets/MYSQL_ROOT_PASSWORD --env
MYSQL_ROOT_HOST_FILE=/etc/mariadb-secrets/MYSQL_ROOT_HOST --env
MYSQL_DATABASE_FILE=/etc/mariadb-secrets/MYSQL_DATABASE --env
MYSQL_USER_FILE=/etc/mariadb-secrets/MYSQL_USER --env
MYSQL_PASSWORD_FILE=/etc/mariadb-secrets/MYSQL_PASSWORD --name mariadb
${MARIADB_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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-minidlna.service
new/containers-systemd-0.0+git20220706.2c928fe/container-minidlna.service
--- old/containers-systemd-0.0+git20220628.ee9e63c/container-minidlna.service
2022-06-28 11:12:23.000000000 +0200
+++ new/containers-systemd-0.0+git20220706.2c928fe/container-minidlna.service
2022-07-06 10:08:30.000000000 +0200
@@ -15,7 +15,7 @@
EnvironmentFile=-/etc/default/container-minidlna
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${MINIDLNA_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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} ${MINIDLNA_NET} -v ${MEDIA_DIR}:/media:Z ${MINIDLNA_ENV}
-e DEBUG=${DEBUG} --name minidlna ${MINIDLNA_IMAGE_PATH} ${MINIDLNA_OPTS}"
+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 $MINIDLNA_NET -v ${MEDIA_DIR}:/media:Z ${MINIDLNA_ENV} -e
DEBUG=${DEBUG} --name minidlna ${MINIDLNA_IMAGE_PATH} $MINIDLNA_OPTS
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-nfs-server.service
new/containers-systemd-0.0+git20220706.2c928fe/container-nfs-server.service
--- old/containers-systemd-0.0+git20220628.ee9e63c/container-nfs-server.service
2022-06-28 11:12:23.000000000 +0200
+++ new/containers-systemd-0.0+git20220706.2c928fe/container-nfs-server.service
2022-07-06 10:08:30.000000000 +0200
@@ -15,7 +15,7 @@
EnvironmentFile=-/etc/default/container-nfs-server
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${NFS_SERVER_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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} ${NFS_SERVER_PORTS} --privileged -v
${EXPORTS_FILE}:/etc/exports -v ${EXPORTS_DIR}:${EXPORTS_DIR} --name nfs-server
${NFS_SERVER_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 $NFS_SERVER_PORTS --privileged -v
${EXPORTS_FILE}:/etc/exports:ro -v ${EXPORTS_DIR}:${EXPORTS_DIR} --name
nfs-server ${NFS_SERVER_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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-nginx.service
new/containers-systemd-0.0+git20220706.2c928fe/container-nginx.service
--- old/containers-systemd-0.0+git20220628.ee9e63c/container-nginx.service
2022-06-28 11:12:23.000000000 +0200
+++ new/containers-systemd-0.0+git20220706.2c928fe/container-nginx.service
2022-07-06 10:08:30.000000000 +0200
@@ -16,7 +16,7 @@
ExecStartPre=-/usr/bin/mkdir -p ${NGINX_CFG} ${HTDOCS_DIR}
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${NGINX_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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 ${NGINX_CFG}:/etc/nginx -v
${HTDOCS_DIR}:/srv/www/htdocs ${NGINX_PORTS} --name nginx ${NGINX_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 ${NGINX_CFG}:/etc/nginx:Z -v
${HTDOCS_DIR}:/srv/www/htdocs:z $NGINX_PORTS --name nginx ${NGINX_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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-openldap.service
new/containers-systemd-0.0+git20220706.2c928fe/container-openldap.service
--- old/containers-systemd-0.0+git20220628.ee9e63c/container-openldap.service
2022-06-28 11:12:23.000000000 +0200
+++ new/containers-systemd-0.0+git20220706.2c928fe/container-openldap.service
2022-07-06 10:08:30.000000000 +0200
@@ -16,7 +16,7 @@
ExecStartPre=-/usr/bin/mkdir -p ${LDAP_DB_DIR} ${LDAP_ETC_DIR}
${LDAP_CERTS_DIR}
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${OPENLDAP_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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 ${LDAP_DB_DIR}:/var/lib/ldap:Z -v
${LDAP_ETC_DIR}:/etc/openldap/slapd.d:Z -v
${SECRETS_DIR}:/etc/openldap-secrets:Z -v
${LDAP_CERTS_DIR}:/etc/openldap/certs:z ${LDAP_PORTS} -e
LDAP_ADMIN_PASSWORD_FILE=${LDAP_ADMIN_PASSWORD_FILE} -e
LDAP_CONFIG_PASSWORD_FILE=${LDAP_CONFIG_PASSWORD_FILE} -e
MAIL_ACCOUNT_READER_PASSWORD_FILE=${MAIL_ACCOUNT_READER_PASSWORD_FILE} -e
LDAP_DOMAIN=${LDAP_DOMAIN} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e
LDAP_ORGANIZATION=${LDAP_ORGANIZATION} -e
LDAP_SEED_LDIF_PATH=${LDAP_SEED_LDIF_PATH} -e
LDAP_SEED_SCHEMA_PATH=${LDAP_SEED_SCHEMA_PATH} -e LDAP_TLS=${LDAP_TLS} -e
LDAP_TLS_CA_CRT=${LDAP_TLS_CA_CRT} -e LDAP_TLS_CA_KEY=${LDAP_TLS_CA_KEY} -e
LDAP_TLS_CRT=${LDAP_TLS_CRT} -e LDAP_TLS_KEY=${LDAP_TLS_KEY} -e
LDAP_TLS_ENFORCE=${LDAP_TLS_ENFORCE} -e
LDAP_TLS_VERIFY_CLIENT=${LDAP_TLS_VERIFY_CLIENT} -e LDAP_
NOFILE=${LDAP_NOFILE} -e LDAP_UID=${LDAP_UID} -e LDAP_GID=${LDAP_GID} -e
SLAPD_LOG_LEVEL=${SLAPD_LOG_LEVEL} -e
SETUP_FOR_MAILSERVER=${SETUP_FOR_MAILSERVER} -e DEBUG=${DEBUG} --name openldap
${OPENLDAP_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 ${LDAP_DB_DIR}:/var/lib/ldap:Z -v
${LDAP_ETC_DIR}:/etc/openldap/slapd.d:Z -v
${SECRETS_DIR}:/etc/openldap-secrets:Z -v
${LDAP_CERTS_DIR}:/etc/openldap/certs:z ${LDAP_PORTS} -e
LDAP_ADMIN_PASSWORD_FILE=${LDAP_ADMIN_PASSWORD_FILE} -e
LDAP_CONFIG_PASSWORD_FILE=${LDAP_CONFIG_PASSWORD_FILE} -e
MAIL_ACCOUNT_READER_PASSWORD_FILE=${MAIL_ACCOUNT_READER_PASSWORD_FILE} -e
LDAP_DOMAIN=${LDAP_DOMAIN} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e
LDAP_ORGANIZATION=${LDAP_ORGANIZATION} -e
LDAP_SEED_LDIF_PATH=${LDAP_SEED_LDIF_PATH} -e
LDAP_SEED_SCHEMA_PATH=${LDAP_SEED_SCHEMA_PATH} -e LDAP_TLS=${LDAP_TLS} -e
LDAP_TLS_CA_CRT=${LDAP_TLS_CA_CRT} -e LDAP_TLS_CA_KEY=${LDAP_TLS_CA_KEY} -e
LDAP_TLS_CRT=${LDAP_TLS_CRT} -e LDAP_TLS_KEY=${LDAP_TLS_KEY} -e
LDAP_TLS_ENFORCE=${LDAP_TLS_ENFORCE} -e
LDAP_TLS_VERIFY_CLIENT=${LDAP_TLS_VERIFY_CLIENT} -e LDAP_NOFILE=${LDAP_
NOFILE} -e LDAP_UID=${LDAP_UID} -e LDAP_GID=${LDAP_GID} -e
SLAPD_LOG_LEVEL=${SLAPD_LOG_LEVEL} -e
SETUP_FOR_MAILSERVER=${SETUP_FOR_MAILSERVER} -e DEBUG=${DEBUG} --name openldap
${OPENLDAP_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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-postfix.service
new/containers-systemd-0.0+git20220706.2c928fe/container-postfix.service
--- old/containers-systemd-0.0+git20220628.ee9e63c/container-postfix.service
2022-06-28 11:12:23.000000000 +0200
+++ new/containers-systemd-0.0+git20220706.2c928fe/container-postfix.service
2022-07-06 10:08:30.000000000 +0200
@@ -16,7 +16,7 @@
ExecStartPre=-/usr/bin/mkdir -p ${POSTFIX_SPOOL_DIR} ${POSTFIX_VMAIL_DIR}
${EXTRA_PKI_DIR}
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${POSTFIX_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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 ${POSTFIX_SPOOL_DIR}:/var/spool/postfix:Z -v
${POSTFIX_VMAIL_DIR}:/var/spool/vmail:z -v ${EXTRA_PKI_DIR}:/etc/pki:z -v
${SECRETS_DIR}:/etc/postfix-secrets:Z ${POSTFIX_PORTS} -e
SERVER_HOSTNAME=${SERVER_HOSTNAME} -e SERVER_DOMAIN=${SERVER_DOMAIN} -e
SMTP_TLS_SECURITY_LEVEL=${SMTP_TLS_SECURITY_LEVEL} -e
SMTP_RELAYHOST=${SMTP_RELAYHOST} -e SMTP_PORT=${SMTP_PORT} -e
NULLCLIENT=${NULLCLIENT} -e SMTP_USERNAME=${SMTP_USERNAME} -e
SMTP_PASSWORD_FILE=${SMTP_PASSWORD_FILE} -e SMTP_NETWORKS=${SMTP_NETWORKS} -e
MASQUERADE_DOMAINS=${MASQUERADE_DOMAINS} -e MYDESTINATION=${MYDESTINATION} -e
SPAMASSASSIN_HOST=${SPAMASSASSIN_HOST} -e LMTP=${LMTP} -e
VIRTUAL_MBOX=${VIRTUAL_MBOX} -e VMAIL_UID=${VMAIL_UID} -e
VIRTUAL_DOMAINS=${VIRTUAL_DOMAINS} -e VIRTUAL_USERS=${VIRTUAL_USERS} -e
USE_LDAP=${USE_LDAP} -e LDAP_BASE_DN=${LDAP_BASE_DN} -
e LDAP_SERVER_URL=${LDAP_SERVER_URL} -e LDAP_BIND_DN=${LDAP_BIND_DN} -e
LDAP_BIND_PASSWORD_FILE=${LDAP_BIND_PASSWORD_FILE} -e
LDAP_USE_TLS=${LDAP_USE_TLS} -e LDAP_TLS_CA_CRT=${LDAP_TLS_CA_CRT} -e TZ=${TZ}
-e DEBUG=${DEBUG} --name postfix ${POSTFIX_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 ${POSTFIX_SPOOL_DIR}:/var/spool/postfix:Z -v
${POSTFIX_VMAIL_DIR}:/var/spool/vmail:z -v ${EXTRA_PKI_DIR}:/etc/pki:z -v
${SECRETS_DIR}:/etc/postfix-secrets:Z $POSTFIX_PORTS -e
SERVER_HOSTNAME=${SERVER_HOSTNAME} -e SERVER_DOMAIN=${SERVER_DOMAIN} -e
SMTP_TLS_SECURITY_LEVEL=${SMTP_TLS_SECURITY_LEVEL} -e
SMTP_RELAYHOST=${SMTP_RELAYHOST} -e SMTP_PORT=${SMTP_PORT} -e
NULLCLIENT=${NULLCLIENT} -e SMTP_USERNAME=${SMTP_USERNAME} -e
SMTP_PASSWORD_FILE=${SMTP_PASSWORD_FILE} -e SMTP_NETWORKS=${SMTP_NETWORKS} -e
MASQUERADE_DOMAINS=${MASQUERADE_DOMAINS} -e MYDESTINATION=${MYDESTINATION} -e
SPAMASSASSIN_HOST=${SPAMASSASSIN_HOST} -e LMTP=${LMTP} -e
VIRTUAL_MBOX=${VIRTUAL_MBOX} -e VMAIL_UID=${VMAIL_UID} -e
VIRTUAL_DOMAINS=${VIRTUAL_DOMAINS} -e VIRTUAL_USERS=${VIRTUAL_USERS} -e
USE_LDAP=${USE_LDAP} -e LDAP_BASE_DN=${LDAP_BASE_DN} -e LDAP_SERVER_UR
L=${LDAP_SERVER_URL} -e LDAP_BIND_DN=${LDAP_BIND_DN} -e
LDAP_BIND_PASSWORD_FILE=${LDAP_BIND_PASSWORD_FILE} -e
LDAP_USE_TLS=${LDAP_USE_TLS} -e LDAP_TLS_CA_CRT=${LDAP_TLS_CA_CRT} -e TZ=${TZ}
-e DEBUG=${DEBUG} --name postfix ${POSTFIX_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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-roundcube.service
new/containers-systemd-0.0+git20220706.2c928fe/container-roundcube.service
--- old/containers-systemd-0.0+git20220628.ee9e63c/container-roundcube.service
2022-06-28 11:12:23.000000000 +0200
+++ new/containers-systemd-0.0+git20220706.2c928fe/container-roundcube.service
2022-07-06 10:08:30.000000000 +0200
@@ -16,7 +16,7 @@
ExecStartPre=-/usr/bin/mkdir -p ${ROUNDCUBE_DB_DIR} ${ROUNDCUBE_CONFIG_DIR}
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${ROUNDCUBE_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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 ${ROUNDCUBE_DB_DIR}:/var/roundcube/db:z -v
${ROUNDCUBE_CONFIG_DIR}/config.inc.php:/var/www/html/config/config.inc.php:z
${ROUNDCUBE_PORTS} -e ROUNDCUBEMAIL_DEFAULT_HOST=${ROUNDCUBEMAIL_DEFAULT_HOST}
-e ROUNDCUBEMAIL_SMTP_SERVER=${ROUNDCUBEMAIL_SMTP_SERVER} -e
ROUNDCUBEMAIL_PLUGINS=${ROUNDCUBEMAIL_PLUGINS} ${ROUNDCUBE_EXTRA_ENV}
${ROUNDCUBE_PORTS} --name roundcube ${ROUNDCUBE_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 ${ROUNDCUBE_DB_DIR}:/var/roundcube/db:z -v
${ROUNDCUBE_CONFIG_DIR}/config.inc.php:/var/www/html/config/config.inc.php:z
$ROUNDCUBE_PORTS -e ROUNDCUBEMAIL_DEFAULT_HOST=${ROUNDCUBEMAIL_DEFAULT_HOST} -e
ROUNDCUBEMAIL_SMTP_SERVER=${ROUNDCUBEMAIL_SMTP_SERVER} -e
ROUNDCUBEMAIL_PLUGINS=${ROUNDCUBEMAIL_PLUGINS} $ROUNDCUBE_EXTRA_ENV
$ROUNDCUBE_PORTS --name roundcube ${ROUNDCUBE_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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-samba.service
new/containers-systemd-0.0+git20220706.2c928fe/container-samba.service
--- old/containers-systemd-0.0+git20220628.ee9e63c/container-samba.service
2022-06-28 11:12:23.000000000 +0200
+++ new/containers-systemd-0.0+git20220706.2c928fe/container-samba.service
2022-07-06 10:08:30.000000000 +0200
@@ -15,7 +15,7 @@
EnvironmentFile=-/etc/default/container-samba
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${SAMBA_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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} ${SAMBA_VOLUMES} ${SAMBA_PORTS} --name samba
${SAMBA_IMAGE_PATH} ${SAMBA_USERS} ${SAMBA_SHARES}"
+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 $SAMBA_VOLUMES $SAMBA_PORTS --name samba ${SAMBA_IMAGE_PATH}
$SAMBA_USERS $SAMBA_SHARES
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-spamassassin.service
new/containers-systemd-0.0+git20220706.2c928fe/container-spamassassin.service
---
old/containers-systemd-0.0+git20220628.ee9e63c/container-spamassassin.service
2022-06-28 11:12:23.000000000 +0200
+++
new/containers-systemd-0.0+git20220706.2c928fe/container-spamassassin.service
2022-07-06 10:08:30.000000000 +0200
@@ -16,7 +16,7 @@
ExecStartPre=-/usr/bin/mkdir -p ${CONFIG_DIR}
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${SPAMASSASSIN_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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 783:783 -v ${CONFIG_DIR}:/etc/spamassassin -e
DEBUG=${DEBUG} -e TZ=${TZ} --name spamassassin ${SPAMASSASSIN_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 783:783 -v ${CONFIG_DIR}:/etc/spamassassin:Z -e
DEBUG=${DEBUG} -e TZ=${TZ} --name spamassassin ${SPAMASSASSIN_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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-squid.service
new/containers-systemd-0.0+git20220706.2c928fe/container-squid.service
--- old/containers-systemd-0.0+git20220628.ee9e63c/container-squid.service
2022-06-28 11:12:23.000000000 +0200
+++ new/containers-systemd-0.0+git20220706.2c928fe/container-squid.service
2022-07-06 10:08:30.000000000 +0200
@@ -15,7 +15,7 @@
EnvironmentFile=-/etc/default/container-squid
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${SQUID_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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} ${PODMAN_SQUID_ARGS} --name squid ${SQUID_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 $PODMAN_SQUID_ARGS --name squid ${SQUID_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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/containers-systemd-0.0+git20220628.ee9e63c/container-wsdd.service
new/containers-systemd-0.0+git20220706.2c928fe/container-wsdd.service
--- old/containers-systemd-0.0+git20220628.ee9e63c/container-wsdd.service
2022-06-28 11:12:23.000000000 +0200
+++ new/containers-systemd-0.0+git20220706.2c928fe/container-wsdd.service
2022-07-06 10:08:30.000000000 +0200
@@ -15,7 +15,7 @@
EnvironmentFile=-/etc/default/container-wsdd
ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${WSDD_IMAGE_PATH}
-ExecStart=/bin/sh -c "/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} ${WSDD_NET} ${WSDD_ENV} -e DEBUG=${DEBUG} --name wsdd
${WSDD_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 $WSDD_NET $WSDD_ENV -e DEBUG=${DEBUG} --name wsdd
${WSDD_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
