Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2019-02-13 09:58:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker" Wed Feb 13 09:58:25 2019 rev:86 rq:673384 version:18.09.1_ce Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2019-01-21 10:07:00.194882436 +0100 +++ /work/SRC/openSUSE:Factory/.docker.new.28833/docker.changes 2019-02-13 09:58:50.617658137 +0100 @@ -1,0 +2,18 @@ +Sat Feb 9 13:54:03 UTC 2019 - Aleksa Sarai <[email protected]> + +- Update shell completion to use Group: System/Shells. + +------------------------------------------------------------------- +Wed Feb 6 14:37:43 UTC 2019 - Michal Jura <[email protected]> + +- Add daemon.json file with rotation logs cofiguration, bsc#1114832 + +------------------------------------------------------------------- +Tue Feb 5 11:24:02 UTC 2019 - Aleksa Sarai <[email protected]> + +- Update to Docker 18.09.1-ce. See upstream changelog in the packaged + /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1124308 +- Remove upstreamed patches. + - bsc1073877-0001-apparmor-allow-receiving-of-signals-from-docker-kill.patch + +------------------------------------------------------------------- Old: ---- bsc1073877-0001-apparmor-allow-receiving-of-signals-from-docker-kill.patch docker-18.09.0_ce.tar.xz New: ---- docker-18.09.1_ce.4c52b901c6cb.tar.xz docker-daemon.json ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.Cno4ik/_old 2019-02-13 09:58:51.777657856 +0100 +++ /var/tmp/diff_new_pack.Cno4ik/_new 2019-02-13 09:58:51.781657855 +0100 @@ -42,24 +42,24 @@ # helpfully injects into our build environment from the changelog). If you want # to generate a new git_commit_epoch, use this: # $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s' -%define git_version e68fc7a215d7 -%define git_commit_epoch 1534871791 +%define git_version 4c52b901c6cb +%define git_commit_epoch 1547060456 # These are the git commits required. We verify them against the source to make # sure we didn't miss anything important when doing upgrades. -%define required_containerd 468a545b9edcd5932818eb9de8e72413e616e86e -%define required_dockerrunc 69663f0bd4b60df09991c08812a60108003fa340 -%define required_libnetwork 6da50d1978302f04c3e2089e29112ea24812f05b +%define required_containerd 9754871865f7fe2f4e74d43e2fc7ccd237edcbce +%define required_dockerrunc 96ec2177ae841256168fcf76954f7177af9446eb +%define required_libnetwork 2cfbf9b1f98162a55829a21cc603c76072a75382 Name: %{realname}%{name_suffix} -Version: 18.09.0_ce +Version: 18.09.1_ce Release: 0 Summary: The Linux container runtime License: Apache-2.0 Group: System/Management Url: http://www.docker.io # TODO(VR): check those SOURCE files below -Source: %{realname}-%{version}.tar.xz +Source: %{realname}-%{version}.%{git_version}.tar.xz Source1: docker.service # bsc#1086185 -- but we only apply this on Kubic. Source2: docker-kubic-service.conf @@ -70,14 +70,13 @@ Source7: README_SUSE.md Source8: docker-audit.rules Source9: tests.sh +Source10: docker-daemon.json # SUSE-FEATURE: Adds the /run/secrets mountpoint inside all Docker containers # which is not snapshotted when images are committed. Note that if you modify # this patch, please also modify the patch in the suse-secrets-v<version> # branch in http://github.com/suse/docker.mirror. Patch200: secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch Patch201: secrets-0002-SUSE-implement-SUSE-container-secrets.patch -# SUSE-BACKPORT: Backport of https://github.com/docker/docker/pull/37831. bsc#1073877 -Patch400: bsc1073877-0001-apparmor-allow-receiving-of-signals-from-docker-kill.patch # SUSE-BACKPORT: Backport of https://github.com/docker/docker/pull/37353. bsc#1099277 Patch401: bsc1073877-0002-apparmor-clobber-docker-default-profile-on-start.patch # SUSE-BACKPORT: Backport of https://github.com/docker/cli/pull/1306. boo#1047218 @@ -175,7 +174,7 @@ %package bash-completion Summary: Bash Completion for %{name} -Group: System/Management +Group: System/Shells Requires: %{name} = %{version} Supplements: packageand(%{name}:bash-completion) BuildArch: noarch @@ -196,7 +195,7 @@ %package zsh-completion Summary: Zsh Completion for %{name} -Group: System/Management +Group: System/Shells Requires: %{name} = %{version} Supplements: packageand(%{name}:zsh) BuildArch: noarch @@ -259,7 +258,7 @@ %endif %prep -%setup -q -n %{realname}-%{version} +%setup -q -n %{realname}-%{version}.%{git_version} %if 0%{?is_opensuse} # nothing %else @@ -267,8 +266,6 @@ %patch200 -p1 %patch201 -p1 %endif -# bsc#1073877 -%patch400 -p1 # bsc#1099277 %patch401 -p1 # boo#1047218 @@ -394,6 +391,9 @@ # sysconfig file install -D -m 644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.docker +# install docker config file +install -D -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/daemon.json + # install manpages (using the ones from the engine) install -d %{buildroot}%{_mandir}/man1 install -p -m 644 components/cli/man/man1/*.1 %{buildroot}%{_mandir}/man1 @@ -451,6 +451,7 @@ %dir %{_unitdir}/%{realname}.service.d/ %{_unitdir}/%{realname}.service.d/90-kubic.conf %endif +%config %{_sysconfdir}/daemon.json %config %{_sysconfdir}/audit/rules.d/%{realname}.rules %{_udevrulesdir}/80-%{realname}.rules %{_fillupdir}/sysconfig.docker ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Cno4ik/_old 2019-02-13 09:58:51.861657835 +0100 +++ /var/tmp/diff_new_pack.Cno4ik/_new 2019-02-13 09:58:51.865657835 +0100 @@ -3,15 +3,12 @@ <param name="url">https://github.com/docker/docker-ce.git</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">18.09.0_ce</param> - <param name="revision">v18.09.0</param> + <param name="versionformat">18.09.1_ce.%h</param> + <param name="revision">v18.09.1</param> <param name="filename">docker</param> </service> <service name="recompress" mode="disabled"> <param name="file">docker-*.tar</param> <param name="compression">xz</param> </service> - <service name="set_version" mode="disabled"> - <param name="basename">docker</param> - </service> </services> ++++++ docker-daemon.json ++++++ { "log-level": "warn", "log-driver": "json-file", "log-opts": { "max-size": "10m", "max-file": "5" } }
