From 3ca9f987ae43e3f60e06b50d705fe8d98277a911b418762e49c7942bfdb9ecc1 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Tue, 19 Dec 2017 03:42:51 +0000 Subject: [PATCH] Accepting request 558085 from home:cyphar:containers:docker_v17.09_ce - Update to Docker v17.09.1_ce. Upstream changelog: https://github.com/docker/docker-ce/releases/tag/v17.09.1-ce - Removed patches (merged upstream): - bsc1045628-0001-devicemapper-remove-container-rootfs-mountPath-after.patch - bsc1066210-0001-vendor-update-to-github.com-vbatts-tar-split-v0.10.2.patch - bsc1066801-0001-oci-add-proc-scsi-to-masked-paths.patch - Update to Docker v17.09.0_ce. Upstream changelog: https://github.com/docker/docker-ce/releases/tag/v17.09.0-ce - Rebased patches: * bsc1021227-0001-pkg-devmapper-dynamically-load-dm_task_deferred_remo.patch * bsc1045628-0001-devicemapper-remove-container-rootfs-mountPath-after.patch * bsc1055676-0001-daemon-oci-obey-CL_UNPRIVILEGED-for-user-namespaced-.patch * secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch * secrets-0002-SUSE-implement-SUSE-container-secrets.patch - Removed patches (merged upstream): - bsc1064781-0001-Allow-to-override-build-date.patch OBS-URL: https://build.opensuse.org/request/show/558085 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=66 --- _service | 2 +- containerd-git.06b9cb351610.tar.xz | 3 ++ containerd-git.3addd8406531.tar.xz | 3 -- containerd.changes | 8 +++++- containerd.spec | 46 ++++++++++++++++++------------ 5 files changed, 38 insertions(+), 24 deletions(-) create mode 100644 containerd-git.06b9cb351610.tar.xz delete mode 100644 containerd-git.3addd8406531.tar.xz diff --git a/_service b/_service index 8065be1..cb7a655 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git containerd git.%h - 3addd840653146c90a254301d6c3a663c7fd6429 + 06b9cb35161009dcb7123345749fef02f7cea8e0 .git diff --git a/containerd-git.06b9cb351610.tar.xz b/containerd-git.06b9cb351610.tar.xz new file mode 100644 index 0000000..11da171 --- /dev/null +++ b/containerd-git.06b9cb351610.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6962fa86dd1396c4a8d0c0509ec26a8f3b9911bf5884bfd6a5ec6e2d2119f73f +size 529504 diff --git a/containerd-git.3addd8406531.tar.xz b/containerd-git.3addd8406531.tar.xz deleted file mode 100644 index e69aff1..0000000 --- a/containerd-git.3addd8406531.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f39b3b7a42f91af8352e4f7d1365936ce82423fc82c146b73ba0c72e4d1f478 -size 641108 diff --git a/containerd.changes b/containerd.changes index f71ab95..8092e9c 100644 --- a/containerd.changes +++ b/containerd.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Mon Dec 11 12:30:31 UTC 2017 - asarai@suse.com + +- Update to containerd@06b9cb35161009dcb7123345749fef02f7cea8e0, which is + requried by Docker 17.09.1_ce. + ------------------------------------------------------------------- Thu Nov 23 13:48:04 UTC 2017 - rbrown@suse.com -- Replace references to /var/adm/fillup-templates with new +- Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) ------------------------------------------------------------------- diff --git a/containerd.spec b/containerd.spec index b014e4e..5713d26 100644 --- a/containerd.spec +++ b/containerd.spec @@ -26,17 +26,22 @@ %define GO_BUILD_FLAGS -buildmode=pie # MANUAL: Update the git_version and git_revision -%define git_version 3addd840653146c90a254301d6c3a663c7fd6429 -%define git_short 3addd8406531 +%define git_version 06b9cb35161009dcb7123345749fef02f7cea8e0 +%define git_short 06b9cb351610 # How to get the git_revision # git clone https://github.com/containerd/containerd.git containerd-upstream # cd containerd # git checkout $git_version # git_revision=r$(git rev-list HEAD | wc -l) -%define git_revision r671 +%define git_revision r706 + +# These are the git commits required. We verify them against the source to make +# sure we didn't miss anything important when doing upgrades. This MUST match +# required_dockerrunc in docker.spec! +%define required_dockerrunc 3f2f8b84a77f73d38244dd690525642a72156c64 Name: containerd -Version: 0.2.8+git%{git_revision}_%{git_short} +Version: 0.2.9+git%{git_revision}_%{git_short} Release: 0 Summary: Standalone OCI Container Daemon License: Apache-2.0 @@ -51,12 +56,11 @@ Patch100: bsc1065109-0001-makefile-add-support-for-build_flags.patch BuildRequires: fdupes BuildRequires: golang(API) = 1.8 BuildRoot: %{_tmppath}/%{name}-%{version}-build -# Currently runC is the only supported runtime for containerd. NOTE: -# This version pinning is done to follow (as well as we can) upstream's -# 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: docker-runc = 1.0.0rc3+gitr3201_2d41c04 +# We provide a git revision so that Docker can require it properly. +Provides: %{name}-git = %{git_version} +# Currently runC is the only supported runtime for containerd. We match the +# same version as the one pinned by Docker. +Requires: docker-runc-git = %{required_dockerrunc} Requires(post): %fillup_prereq %description @@ -94,20 +98,24 @@ Test package for containerd. It contains the source code and the tests. # Do not use symlinks. If you want to run the unit tests for this package at # some point during the build and you need to directly use go list directly it # will get confused by symlinks. -export GOPATH=${HOME}/go:${HOME}/go/src/github.com/containerd/containerd/vendor -mkdir -p $HOME/go/src/github.com/containerd/containerd -rm -rf $HOME/go/src/github.com/containerd/containerd/* -cp -ar * $HOME/go/src/github.com/containerd/containerd +export GOPATH=$HOME/go +export PROJECT=$HOME/go/src/github.com/containerd/containerd +mkdir -p $PROJECT +rm -rf $PROJECT/* +cp -ar * $PROJECT -make GIT_COMMIT=%{git_version} -cp bin/ctr ctr-%{version} -cp bin/containerd containerd-%{version} -cp bin/containerd-shim containerd-shim-%{version} +make -C $PROJECT GIT_COMMIT=%{git_version} +cp $PROJECT/bin/ctr ctr-%{version} +cp $PROJECT/bin/containerd containerd-%{version} +cp $PROJECT/bin/containerd-shim containerd-shim-%{version} %check export GOPATH=$HOME/go/src/github.com/containerd/containerd/vendor:$GOPATH cd $HOME/go/src/github.com/containerd/containerd -%go_tool test %GO_BUILD_FLAGS -v $(%go_tool list ./... | grep github.com/containerd/containerd | grep -v /integration-test) +%go_tool test %GO_BUILD_FLAGS -v $(%go_tool list ./... | \ + grep github.com/containerd/containerd | \ + grep -v github.com/containerd/containerd/vendor | \ + grep -v /integration-test) %install install -D -m755 containerd-%{version} %{buildroot}/%{_sbindir}/containerd