From 7efe4a265af12ce0cf831c13856724004a813ef99aee16b6ccf8602ab8a1299f Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Sun, 5 Mar 2017 03:06:22 +0000 Subject: [PATCH] Accepting request 461896 from home:jordimassaguerpla:branch:Vc:update_docker_1_13 - update to docker 1.13.0 requirement OBS-URL: https://build.opensuse.org/request/show/461896 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=44 --- _service | 2 +- containerd-git.03e5862.tar.xz | 3 +++ containerd-git.2a5e70c.tar.xz | 3 --- containerd.changes | 5 +++++ containerd.spec | 6 +++--- 5 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 containerd-git.03e5862.tar.xz delete mode 100644 containerd-git.2a5e70c.tar.xz diff --git a/_service b/_service index 2c406ab..3738fd7 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git containerd git.%h - 2a5e70cbf65457815ee76b7e5dd2a01292d9eca8 + 03e5862ec0d8d3b3f750e19fca3ee367e13c090e .git diff --git a/containerd-git.03e5862.tar.xz b/containerd-git.03e5862.tar.xz new file mode 100644 index 0000000..e125dc3 --- /dev/null +++ b/containerd-git.03e5862.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ceeea27bcbbfbc21fb363407520c4415055a8c2abe284d7247f120d5bf1031e +size 495152 diff --git a/containerd-git.2a5e70c.tar.xz b/containerd-git.2a5e70c.tar.xz deleted file mode 100644 index b73af48..0000000 --- a/containerd-git.2a5e70c.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f15e307be487785e238a94fd99304364259a5099b7a49f6fada70f33c993bd06 -size 481888 diff --git a/containerd.changes b/containerd.changes index 805fdce..1ee6319 100644 --- a/containerd.changes +++ b/containerd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 24 18:08:41 UTC 2017 - jmassaguerpla@suse.com + +- update to docker 1.13.0 requirement + ------------------------------------------------------------------- Sat Jan 14 06:38:29 UTC 2017 - asarai@suse.com diff --git a/containerd.spec b/containerd.spec index 1ecec5b..24b7f30 100644 --- a/containerd.spec +++ b/containerd.spec @@ -39,13 +39,13 @@ %endif # MANUAL: Update the git_version and git_revision -%define git_version 2a5e70c +%define git_version 03e5862 # How to get the git_revision # git clone https://github.com/docker/containerd.git containerd-upstream # cd containerd # git checkout $git_version # git_revision=r$(git rev-list HEAD | wc -l) -%define git_revision r569 +%define git_revision r608 %define version_unconverted %{git_version} Name: containerd @@ -70,7 +70,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # Dockerfile. However, for some reason the Dockerfile for containerd # diverges from the one for Docker. As such, this cannot be a hard # requirement (that would break Docker). -Requires: runc = 0.1.1+gitr2819_50a19c6 +Requires: runc = 0.1.1+gitr2942_2f7393a Requires(post): %fillup_prereq %define client ctr