SHA256
1
0
forked from pool/docker

- Update to Docker 18.09.5-ce see upstream changelog in the packaged

/usr/share/doc/packages/docker/CHANGELOG.md. bsc#1128376 boo#1134068

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=306
This commit is contained in:
2019-05-03 16:22:55 +00:00
committed by Git OBS Bridge
parent c05ebdd094
commit ddeb833513
14 changed files with 65 additions and 58 deletions

View File

@@ -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 774a1f4eee66
%define git_commit_epoch 1551333049
%define git_version e8ff056dbcfa
%define git_commit_epoch 1554940059
# 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 e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e
%define required_dockerrunc 6635b4f0c6af3810594d2770f662f34ddc15b40d
%define required_libnetwork 2cfbf9b1f98162a55829a21cc603c76072a75382
%define required_containerd bb71b10fd8f58240ca47fbb579b9d1028eea7c84
%define required_dockerrunc 2b18fe1d885ee5083ef9f0838fee39b62d653e30
%define required_libnetwork 4725f2163fb214a6312f3beae5991f838ec36326
Name: %{realname}%{name_suffix}
Version: 18.09.3_ce
Version: 18.09.5_ce
Release: 0
Summary: The Linux container runtime
Summary: The Moby-project 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}.%{git_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
@@ -78,7 +78,7 @@ Source10: docker-daemon.json
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/37353. bsc#1099277
Patch401: bsc1073877-0002-apparmor-clobber-docker-default-profile-on-start.patch
Patch401: bsc1073877-0001-apparmor-clobber-docker-default-profile-on-start.patch
# SUSE-BACKPORT: Backport of https://github.com/docker/cli/pull/1306. boo#1047218
Patch402: bsc1047218-0001-man-obey-SOURCE_DATE_EPOCH-when-generating-man-pages.patch
# SUSE-ISSUE: Revert of https://github.com/docker/docker/pull/37907.
@@ -256,7 +256,7 @@ docker container runtime configuration for kubeadm
%endif
%prep
%setup -q -n %{realname}-%{version}.%{git_version}
%setup -q -n %{realname}-%{version}_%{git_version}
%if 0%{?is_opensuse}
# nothing
%else