Accepting request 535048 from Virtualization:containers
Update containerd to 0.2.8+gitr671_3addd8406531. This is necesary for the Docker 17.07.0_ce update. This SR is in conjunction with: * https://build.opensuse.org/request/show/535047 OBS-URL: https://build.opensuse.org/request/show/535048 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/containerd?expand=0&rev=18
This commit is contained in:
Git OBS Bridge
commit
52ccc72f9d
7
_service
7
_service
@ -1,17 +1,14 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="url">https://github.com/docker/containerd.git</param>
|
||||
<param name="url">https://github.com/containerd/containerd.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">containerd</param>
|
||||
<param name="versionformat">git.%h</param>
|
||||
<param name="revision">422e31ce907fd9c3833a38d7b8fdd023e5a76e73</param>
|
||||
<param name="revision">3addd840653146c90a254301d6c3a663c7fd6429</param>
|
||||
<param name="exclude">.git</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled">
|
||||
<param name="basename">containerd</param>
|
||||
</service>
|
||||
</services>
|
||||
|
||||
3
containerd-git.3addd8406531.tar.xz
Normal file
3
containerd-git.3addd8406531.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2f39b3b7a42f91af8352e4f7d1365936ce82423fc82c146b73ba0c72e4d1f478
|
||||
size 641108
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e4acde51d72203f3f3b057cf571f702ffac6c31fa276dbb22fedc172cf6d8b9a
|
||||
size 506068
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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.8+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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user