Hello community, here is the log from the commit of package containers-systemd for openSUSE:Factory checked in at 2020-02-13 10:12:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containers-systemd (Old) and /work/SRC/openSUSE:Factory/.containers-systemd.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containers-systemd" Thu Feb 13 10:12:48 2020 rev:6 rq:773810 version:0.0+git20200212.47b21c6 Changes: -------- --- /work/SRC/openSUSE:Factory/containers-systemd/containers-systemd.changes 2020-01-30 22:37:54.484595100 +0100 +++ /work/SRC/openSUSE:Factory/.containers-systemd.new.26092/containers-systemd.changes 2020-02-13 10:13:06.332395298 +0100 @@ -1,0 +2,6 @@ +Wed Feb 12 15:24:54 UTC 2020 - [email protected] + +- Update to version 0.0+git20200212.47b21c6: + * Add haproxy + +------------------------------------------------------------------- Old: ---- containers-systemd-0.0+git20200124.e3c2408.tar.xz New: ---- containers-systemd-0.0+git20200212.47b21c6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containers-systemd.spec ++++++ --- /var/tmp/diff_new_pack.lNEhz0/_old 2020-02-13 10:13:08.200396381 +0100 +++ /var/tmp/diff_new_pack.lNEhz0/_new 2020-02-13 10:13:08.220396393 +0100 @@ -16,11 +16,11 @@ # -%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 +%define containers bind dhcp-server haproxy mariadb nginx +%define container_services container-bind.service container-dhcp-server.service container-dhcp6-server.service container-haproxy.service container-mariadb.service container-nginx.service Name: containers-systemd -Version: 0.0+git20200124.e3c2408 +Version: 0.0+git20200212.47b21c6 Release: 0 Summary: Systemd service files and config files for openSUSE container License: MIT @@ -87,6 +87,10 @@ %{_sbindir}/rccontainer-dhcp-server %{_sbindir}/rccontainer-dhcp6-server %ghost %dir /srv/dhcp-server +%{_unitdir}/container-haproxy.service +%{_fillupdir}/sysconfig.container-haproxy +%{_sbindir}/rccontainer-haproxy +%ghost %dir /srv/haproxy %{_unitdir}/container-mariadb.service %{_fillupdir}/sysconfig.container-mariadb %{_sbindir}/rccontainer-mariadb ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.lNEhz0/_old 2020-02-13 10:13:08.608396618 +0100 +++ /var/tmp/diff_new_pack.lNEhz0/_new 2020-02-13 10:13:08.632396632 +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">e3c240825f4ebb250692f97a5e1d7c9a4cf2a80e</param></service> + <param name="changesrevision">47b21c6f0aecd599c52660012a00fcfd973b8b3e</param></service> </servicedata> \ No newline at end of file ++++++ containers-systemd-0.0+git20200124.e3c2408.tar.xz -> containers-systemd-0.0+git20200212.47b21c6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200124.e3c2408/README.md new/containers-systemd-0.0+git20200212.47b21c6/README.md --- old/containers-systemd-0.0+git20200124.e3c2408/README.md 2020-01-24 17:35:39.000000000 +0100 +++ new/containers-systemd-0.0+git20200212.47b21c6/README.md 2020-02-12 16:24:23.000000000 +0100 @@ -7,6 +7,7 @@ * bind * dhcp-server * dhcp6-server + * haproxy * mariadb * nginx @@ -18,6 +19,10 @@ * /etc/sysconfig/container-dhcp contains generic settings for the dhcpd4 and dhcpd6 daemons. It is required to set DHCPD_INTERFACES. During the first start, example ${CONFIG_DIR}/dhcpd.conf or ${CONFIG_DIR}/dhcpd6.conf are created. +## haproxy + + * /etc/sysconfig/container-haproxy contains generic settings + ## mariadb * /etc/sysconfig/container-mariadb contains generic settings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200124.e3c2408/container-haproxy.service new/containers-systemd-0.0+git20200212.47b21c6/container-haproxy.service --- old/containers-systemd-0.0+git20200124.e3c2408/container-haproxy.service 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20200212.47b21c6/container-haproxy.service 2020-02-12 16:24:23.000000000 +0100 @@ -0,0 +1,17 @@ +[Unit] +Description=openSUSE haproxy container +Documentation=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-haproxy-image +After=network-online.target container-bind.service + +[Service] +TimeoutStartSec=0 +Restart=always +EnvironmentFile=/etc/sysconfig/container-haproxy +ExecStartPre=-/usr/bin/podman stop haproxy +ExecStartPre=-/usr/bin/podman rm haproxy +ExecStartPre=-/usr/bin/podman pull ${DHCPD_IMAGE_PATH} +ExecStart=/usr/bin/podman run --rm -v ${CONFIG_FILE}:/etc/haproxy/haproxy.cfg:ro --net=host --name haproxy ${HAPROXY_IMAGE_PATH} +ExecStop=/usr/bin/podman stop -t 2 haproxy + +[Install] +WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/containers-systemd-0.0+git20200124.e3c2408/sysconfig.container-haproxy new/containers-systemd-0.0+git20200212.47b21c6/sysconfig.container-haproxy --- old/containers-systemd-0.0+git20200124.e3c2408/sysconfig.container-haproxy 1970-01-01 01:00:00.000000000 +0100 +++ new/containers-systemd-0.0+git20200212.47b21c6/sysconfig.container-haproxy 2020-02-12 16:24:23.000000000 +0100 @@ -0,0 +1,14 @@ +## Path: Container/haproxy +## Description: Settings for haproxy container +## Type: string +## Default: "registry.opensuse.org/opensuse/haproxy:latest" +# +# Name of the image path to pull the bind image from +HAPROXY_IMAGE_PATH=registry.opensuse.org/opensuse/haproxy:latest + +## Type: string +## Default: "/srv/haproxy/haproxy.cfg" +# +# Name of the haproxy configuration file +CONFIG_FILE="/srv/haproxy/haproxy.cfg" +
