Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package container-registry-systemd for
openSUSE:Factory checked in at 2021-04-12 17:10:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/container-registry-systemd (Old)
and /work/SRC/openSUSE:Factory/.container-registry-systemd.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "container-registry-systemd"
Mon Apr 12 17:10:48 2021 rev:9 rq:884689 version:0.0+git20210412.85b4fd5
Changes:
--------
---
/work/SRC/openSUSE:Factory/container-registry-systemd/container-registry-systemd.changes
2020-05-28 09:13:59.236678848 +0200
+++
/work/SRC/openSUSE:Factory/.container-registry-systemd.new.2401/container-registry-systemd.changes
2021-04-12 17:10:57.478604387 +0200
@@ -1,0 +2,8 @@
+Mon Apr 12 14:01:32 UTC 2021 - [email protected]
+
+- Update to version 0.0+git20210412.85b4fd5:
+ * Fix name of config file
+ * Update service files with new layout
+- Use etc/default instead of sysconfig for configuration file
+
+-------------------------------------------------------------------
Old:
----
container-registry-systemd-0.0+git20200526.1d9ce7b.tar.xz
New:
----
container-registry-systemd-0.0+git20210412.85b4fd5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ container-registry-systemd.spec ++++++
--- /var/tmp/diff_new_pack.vF96VY/_old 2021-04-12 17:10:57.978604940 +0200
+++ /var/tmp/diff_new_pack.vF96VY/_new 2021-04-12 17:10:57.982604944 +0200
@@ -1,7 +1,7 @@
#
# spec file for package container-registry-systemd
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,13 @@
Name: container-registry-systemd
-Version: 0.0+git20200526.1d9ce7b
+Version: 0.0+git20210412.85b4fd5
Release: 0
Summary: Systemd service files and config files for container-registry
License: GPL-3.0-or-later
URL: https://github.com/kubic-project/container-registry-systemd
Source: container-registry-systemd-%{version}.tar.xz
Requires: certstrap
-Requires(post): %fillup_prereq
BuildArch: noarch
%description
@@ -40,13 +39,13 @@
mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_sysconfdir}/registry
mkdir -p %{buildroot}%{_distconfdir}/registry
+mkdir -p %{buildroot}%{_distconfdir}/default
mkdir -p %{buildroot}%{_localstatedir}/lib/container-registry
mkdir -p %{buildroot}%{_unitdir}
-mkdir -p %{buildroot}%{_fillupdir}
mkdir -p %{buildroot}/srv/registry
install -m 644 config.yml* %{buildroot}%{_distconfdir}/registry/
install -m 644 auth_config.yml %{buildroot}%{_distconfdir}/registry
-install -m 644 sysconfig.container-registry %{buildroot}%{_fillupdir}/
+install -m 644 container-registry.default
%{buildroot}%{_distconfdir}/default/container-registry
install -m 755 create-container-registry-certs.sh
%{buildroot}%{_sbindir}/create-container-registry-certs
install -m 755 setup-container-registry.sh
%{buildroot}%{_sbindir}/setup-container-registry
install -m 644 container-registry.service %{buildroot}%{_unitdir}/
@@ -59,7 +58,13 @@
%service_add_pre container-registry.service registry-auth_server.service
%post
-%{fillup_only -n container-registry}
+if [ -f /etc/sysconfig/container-registry ]; then
+ if [ ! -e /etc/default/container-registry ]; then
+ mv /etc/sysconfig/container-registry /etc/default/container-registry
+ else
+ mv /etc/sysconfig/container-registry
/etc/sysconfig/container-registry.rpmsave
+ fi
+fi
%service_add_post container-registry.service registry-auth_server.service
%preun
@@ -73,12 +78,12 @@
%doc README.md
%dir %{_sysconfdir}/registry
%dir %{_distconfdir}/registry
+%{_distconfdir}/default/container-registry
%{_distconfdir}/registry/auth_config.yml
%{_distconfdir}/registry/config.yml
%{_distconfdir}/registry/config.yml.*
%{_unitdir}/container-registry.service
%{_unitdir}/registry-auth_server.service
-%{_fillupdir}/sysconfig.container-registry
%{_sbindir}/create-container-registry-certs
%{_sbindir}/setup-container-registry
%{_sbindir}/rccontainer-registry
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.vF96VY/_old 2021-04-12 17:10:58.022604989 +0200
+++ /var/tmp/diff_new_pack.vF96VY/_new 2021-04-12 17:10:58.026604993 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://github.com/kubic-project/container-registry-systemd.git</param>
- <param
name="changesrevision">1d9ce7b21642621102a4f90e91ed63bd92102336</param>
+ <param
name="changesrevision">85b4fd50024c859eafa56b475f6c375bf848daa5</param>
</service>
</servicedata>
\ No newline at end of file
++++++ container-registry-systemd-0.0+git20200526.1d9ce7b.tar.xz ->
container-registry-systemd-0.0+git20210412.85b4fd5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-registry-systemd-0.0+git20200526.1d9ce7b/README.md
new/container-registry-systemd-0.0+git20210412.85b4fd5/README.md
--- old/container-registry-systemd-0.0+git20200526.1d9ce7b/README.md
2020-05-26 16:40:32.000000000 +0200
+++ new/container-registry-systemd-0.0+git20210412.85b4fd5/README.md
2021-04-12 16:01:11.000000000 +0200
@@ -61,16 +61,20 @@
More information about the registry configuration can be found
[here](https://docs.docker.com/registry/configuration/).
-### Sysconfig File
+### Container default config file
-The file `/etc/sysconfig/container-registry` is read by the systemd service
-file and contains variables to run the registry container.
+The files `/usr/etc/default/container-registry` and
+`/etc/default/container-registry` are read by the systemd service
+and contains variables to run the registry container. The first file contains
+the distribution defaults, the second file is optional and contains the
+changes done by the system administrator.
* REGISTRY_IMAGE_PATH describes where the container registry image can be
found.
* EXTERNAL_PORT defines the port, under which the registry is reacheable.
* STOARGE_DIR defines the directory, where the images are stored.
### Pull-through cache
+
Adjust the configuration file `/etc/registry/config.yml` and add the following
lines to it:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-registry-systemd-0.0+git20200526.1d9ce7b/container-registry.default
new/container-registry-systemd-0.0+git20210412.85b4fd5/container-registry.default
---
old/container-registry-systemd-0.0+git20200526.1d9ce7b/container-registry.default
1970-01-01 01:00:00.000000000 +0100
+++
new/container-registry-systemd-0.0+git20210412.85b4fd5/container-registry.default
2021-04-12 16:01:11.000000000 +0200
@@ -0,0 +1,25 @@
+## Path: Container/Registry
+## Description: Settings for registry container
+## Type: string
+## Default: "registry.opensuse.org/opensuse/registry:latest"
+#
+# Name of the image path to pull the registry image
+REGISTRY_IMAGE_PATH="registry.opensuse.org/opensuse/registry:latest"
+
+## Type: integer
+## Default: "443"
+#
+# External port of the registry. Default port is 5000 as backend
+EXTERNAL_PORT="443"
+
+## Type: string
+## Default: "/srv/registry"
+#
+# Name of the path where the container images should be stored
+STORAGE_DIR="/srv/registry"
+
+## Type: string
+## Default: "registry.opensuse.org/opensuse/docker_auth:latest"
+#
+# Name of the image path to pull the auth server image
+AUTH_SERVER_IMAGE_PATH="registry.opensuse.org/opensuse/docker_auth:latest"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-registry-systemd-0.0+git20200526.1d9ce7b/container-registry.service
new/container-registry-systemd-0.0+git20210412.85b4fd5/container-registry.service
---
old/container-registry-systemd-0.0+git20200526.1d9ce7b/container-registry.service
2020-05-26 16:40:32.000000000 +0200
+++
new/container-registry-systemd-0.0+git20210412.85b4fd5/container-registry.service
2021-04-12 16:01:11.000000000 +0200
@@ -1,23 +1,29 @@
[Unit]
Description=Container Registry
+Documentation=https://github.com/kubic-project/container-registry-systemd
Documentation=https://docs.docker.com/registry/
-After=network-online.target
+After=network-online.target local-fs.target firewalld.service
+Wants=network-online.target
# Make sure that at least the certs directory exists, the registry
# will fail if the configured certificates don't exist.
ConditionPathExists=/etc/registry/certs
[Service]
+Environment=PODMAN_SYSTEMD_UNIT=%n
Restart=on-failure
-EnvironmentFile=/etc/sysconfig/container-registry
-ExecStartPre=-/usr/bin/podman stop %N
-ExecStartPre=-/usr/bin/podman rm %N
-ExecStartPre=-/usr/bin/podman pull ${REGISTRY_IMAGE_PATH}
+RestartSec=1s
+StartLimitBurst=5
+TimeoutStopSec=70
+EnvironmentFile=/usr/etc/default/container-registry
+EnvironmentFile=-/etc/default/container-registry
ExecStartPre=/bin/bash -c 'rm -rf /var/lib/container-registry/*; mkdir -p
/var/lib/container-registry; if [ -d /usr/etc/registry ]; then cp -a
/usr/etc/registry/* /var/lib/container-registry/; fi; cp -a /etc/registry/*
/var/lib/container-registry/'
-ExecStart=/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm -v
/var/lib/container-registry:/etc/registry -p ${EXTERNAL_PORT}:5000 -v
${STORAGE_DIR}:/var/lib/registry --name %N ${REGISTRY_IMAGE_PATH}
-ExecStop=/usr/bin/podman stop %N
-KillMode=none
+ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
+ExecStartPre=-/usr/bin/podman pull ${REGISTRY_IMAGE_PATH}
+ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile
%t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} -v
/var/lib/container-registry:/etc/registry:z -p ${EXTERNAL_PORT}:5000 -v
${STORAGE_DIR}:/var/lib/registry:Z --name %N ${REGISTRY_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=forking
-PIDFile=/%t/%n-pid
+PIDFile=%t/%n.pid
[Install]
WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-registry-systemd-0.0+git20200526.1d9ce7b/registry-auth_server.service
new/container-registry-systemd-0.0+git20210412.85b4fd5/registry-auth_server.service
---
old/container-registry-systemd-0.0+git20200526.1d9ce7b/registry-auth_server.service
2020-05-26 16:40:32.000000000 +0200
+++
new/container-registry-systemd-0.0+git20210412.85b4fd5/registry-auth_server.service
2021-04-12 16:01:11.000000000 +0200
@@ -1,23 +1,28 @@
[Unit]
Description=Authentication server for Docker Registry 2
+Documentation=https://en.opensuse.org/Portal:Container/Image/docker_auth
Documentation=https://github.com/cesanta/docker_auth
# Make sure that at least the certs directory exists, the container
# will fail if the configured certificates don't exist.
ConditionPathExists=/etc/registry/certs
-After=network-online.target
+After=network-online.target local-fs.target firewalld.service
Wants=container-registry.service
[Service]
+Environment=PODMAN_SYSTEMD_UNIT=%n
Restart=on-failure
-EnvironmentFile=/etc/sysconfig/container-registry
-ExecStartPre=-/usr/bin/podman stop %N
-ExecStartPre=-/usr/bin/podman rm %N
+RestartSec=1s
+StartLimitBurst=5
+TimeoutStopSec=70
+EnvironmentFile=/usr/etc/default/container-registry
+EnvironmentFile=-/etc/default/container-registry
+ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.ctr-id
ExecStartPre=-/usr/bin/podman pull ${AUTH_SERVER_IMAGE_PATH}
-ExecStart=/usr/bin/podman run -d --conmon-pidfile /%t/%n-pid --rm -v
/etc/registry:/etc/registry -p 5001:5001 --name %N ${AUTH_SERVER_IMAGE_PATH}
-ExecStop=/usr/bin/podman stop %N
-KillMode=none
+ExecStart=/bin/sh -c "/usr/bin/podman run --conmon-pidfile %t/%n.pid --cidfile
%t/%n.ctr-id --cgroups=no-conmon --replace -d --rm ${PODMAN_EXTRA_ARGS} -v
/etc/registry:/etc/registry:z -p 5001:5001 --name %N ${AUTH_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=forking
-PIDFile=/%t/%n-pid
+PIDFile=%t/%n.pid
[Install]
WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-registry-systemd-0.0+git20200526.1d9ce7b/sysconfig.container-registry
new/container-registry-systemd-0.0+git20210412.85b4fd5/sysconfig.container-registry
---
old/container-registry-systemd-0.0+git20200526.1d9ce7b/sysconfig.container-registry
2020-05-26 16:40:32.000000000 +0200
+++
new/container-registry-systemd-0.0+git20210412.85b4fd5/sysconfig.container-registry
1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-## Path: Container/Registry
-## Description: Settings for registry container
-## Type: string
-## Default: "registry.opensuse.org/opensuse/registry:latest"
-#
-# Name of the image path to pull the registry image
-REGISTRY_IMAGE_PATH="registry.opensuse.org/opensuse/registry:latest"
-
-## Type: integer
-## Default: "443"
-#
-# External port of the registry. Default port is 5000 as backend
-EXTERNAL_PORT="443"
-
-## Type: string
-## Default: "/srv/registry"
-#
-# Name of the path where the container images should be stored
-STORAGE_DIR="/srv/registry"
-
-## Type: string
-## Default: "registry.opensuse.org/opensuse/docker_auth:latest"
-#
-# Name of the image path to pull the auth server image
-AUTH_SERVER_IMAGE_PATH="registry.opensuse.org/opensuse/docker_auth:latest"
