From df76f414ba236e689053ff33b0776a4a2ed8042b10b670edcf8b9922f94ee966 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 18 Oct 2017 04:27:20 +0000 Subject: [PATCH 1/2] Accepting request 534442 from home:vrothberg:branches:Virtualization:containers Related to the docker-ce 17.07 update. OBS-URL: https://build.opensuse.org/request/show/534442 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=58 --- _service | 7 ++--- containerd-git.3addd8406531.tar.xz | 3 +++ containerd-git.422e31c.tar.xz | 3 --- containerd.spec | 41 ++++++++++++++---------------- 4 files changed, 24 insertions(+), 30 deletions(-) create mode 100644 containerd-git.3addd8406531.tar.xz delete mode 100644 containerd-git.422e31c.tar.xz diff --git a/_service b/_service index 2ec4efd..8065be1 100644 --- a/_service +++ b/_service @@ -1,17 +1,14 @@ - https://github.com/docker/containerd.git + https://github.com/containerd/containerd.git git containerd git.%h - 422e31ce907fd9c3833a38d7b8fdd023e5a76e73 + 3addd840653146c90a254301d6c3a663c7fd6429 .git *.tar xz - - containerd - diff --git a/containerd-git.3addd8406531.tar.xz b/containerd-git.3addd8406531.tar.xz new file mode 100644 index 0000000..e69aff1 --- /dev/null +++ b/containerd-git.3addd8406531.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f39b3b7a42f91af8352e4f7d1365936ce82423fc82c146b73ba0c72e4d1f478 +size 641108 diff --git a/containerd-git.422e31c.tar.xz b/containerd-git.422e31c.tar.xz deleted file mode 100644 index 25c2d6f..0000000 --- a/containerd-git.422e31c.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4acde51d72203f3f3b057cf571f702ffac6c31fa276dbb22fedc172cf6d8b9a -size 506068 diff --git a/containerd.spec b/containerd.spec index c2763f6..3078395 100644 --- a/containerd.spec +++ b/containerd.spec @@ -20,17 +20,17 @@ %define GO_BUILD_FLAGS -buildmode=pie # MANUAL: Update the git_version and git_revision -%define git_version 422e31c +%define git_version 3addd8406531 # How to get the git_revision -# git clone https://github.com/docker/containerd.git containerd-upstream +# 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 r639 +%define git_revision r671 %define version_unconverted %{git_version} Name: containerd -Version: 0.2.5+git%{git_revision}_%{git_version} +Version: 0.2.3+git%{git_revision}_%{git_version} Release: 0 Summary: Standalone OCI Container Daemon License: Apache-2.0 @@ -40,15 +40,14 @@ Source: %{name}-git.%{git_version}.tar.xz Source1: %{name}.service Source2: %{name}.socket Source3: sysconfig.%{name} -# Make sure we require go 1.7 -BuildRequires: golang(API) = 1.7 +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 = 0.1.1+gitr2947_9c2d8d1 +Requires: docker-runc = 1.0.0rc3+gitr3201_2d41c04 Requires(post): %fillup_prereq %define client ctr @@ -66,8 +65,7 @@ migration of containers. Summary: Client for %{name} Group: System/Management Requires: %{name} = %{version} -# Make sure we require go 1.7 -BuildRequires: golang(API) = 1.7 +BuildRequires: golang(API) = 1.8 %description ctr Standalone client for containerd, which allows management of containerd containers @@ -75,9 +73,8 @@ separately from Docker. %package test Summary: Test package for containerd -# Make sure we require go 1.7 Group: System/Management -BuildRequires: golang(API) = 1.7 +BuildRequires: golang(API) = 1.8 BuildArch: noarch %description test @@ -90,24 +87,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/docker/containerd/vendor -mkdir -pv $HOME/go/src/github.com/docker/containerd -rm -rf $HOME/go/src/github.com/docker/containerd/* -cp -avr * $HOME/go/src/github.com/docker/containerd +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 # Build daemon. -%go_tool build %GO_BUILD_FLAGS -x -o %{daemon}-%{version} github.com/docker/%{name}/%{daemon} +%go_tool build %GO_BUILD_FLAGS -x -o %{daemon}-%{version} github.com/containerd/%{name}/%{daemon} # Build shim. -%go_tool build %GO_BUILD_FLAGS -x -o %{shim}-%{version} github.com/docker/%{name}/%{shim} +%go_tool build %GO_BUILD_FLAGS -x -o %{shim}-%{version} github.com/containerd/%{name}/%{shim} # Build client. -%go_tool build %GO_BUILD_FLAGS -x -o %{client}-%{version} github.com/docker/%{name}/%{client} +%go_tool build %GO_BUILD_FLAGS -x -o %{client}-%{version} github.com/containerd/%{name}/%{client} %check -export GOPATH=$HOME/go/src/github.com/docker/containerd/vendor:$GOPATH -cd $HOME/go/src/github.com/docker/containerd -%go_tool test %GO_BUILD_FLAGS -v $(%go_tool list ./... | grep github.com/docker/containerd | grep -v /integration-test) +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) %install install -D -m755 %{daemon}-%{version} %{buildroot}/%{_sbindir}/%{daemon} @@ -121,7 +118,7 @@ ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rccontainerd install -D -m644 %SOURCE3 %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} install -d -m755 %{buildroot}/usr/src/containerd/ -cp -avr $HOME/go/src/github.com/docker/containerd/* %{buildroot}/usr/src/containerd/ +cp -ar $HOME/go/src/github.com/containerd/containerd/* %{buildroot}/usr/src/containerd/ %pre %service_add_pre %{name}.service %{name}.socket From c4e35ee0d6e788161b7155062d3fa10e55d0f713259553ae94a0e92ef8d2e931 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 18 Oct 2017 06:27:22 +0000 Subject: [PATCH 2/2] Accepting request 534870 from home:cyphar:containers:docker-ce_v17.07 Correct a series of minor issues in the v17.07.0_ce update, mainly related to changelog entries and the versions of certain packages not being correct. OBS-URL: https://build.opensuse.org/request/show/534870 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=59 --- containerd.changes | 7 +++++++ containerd.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/containerd.changes b/containerd.changes index c40c287..e785841 100644 --- a/containerd.changes +++ b/containerd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 18 04:40:53 UTC 2017 - asarai@suse.com + +- Update to containerd@3addd840653146c90a254301d6c3a663c7fd6429, which is + required by Docker 17.07.0_ce (this commit is effectively v0.2.9 with a few + bugfixes missing). + ------------------------------------------------------------------- Thu Aug 3 14:50:09 UTC 2017 - asarai@suse.com diff --git a/containerd.spec b/containerd.spec index 3078395..c3fba8a 100644 --- a/containerd.spec +++ b/containerd.spec @@ -30,7 +30,7 @@ %define version_unconverted %{git_version} Name: containerd -Version: 0.2.3+git%{git_revision}_%{git_version} +Version: 0.2.8+git%{git_revision}_%{git_version} Release: 0 Summary: Standalone OCI Container Daemon License: Apache-2.0