diff --git a/.abf.yml b/.abf.yml index 74b6174..0903e0d 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - containerd-1.4.3.tar.gz: f68b6518b4af8bcedb41934efa98876ef7c30a5d + containerd-1.7.25.tar.gz: 6ab4f2743ce0283588f663eb7de0b38f461e2467 diff --git a/docker-containerd.spec b/docker-containerd.spec index 672ed6b..cc3b5f5 100644 --- a/docker-containerd.spec +++ b/docker-containerd.spec @@ -16,18 +16,16 @@ Summary: A daemon to control runC Name: docker-containerd -Version: 1.4.3 +Version: 1.7.25 Release: 1 License: ASL 2.0 Group: System/Kernel and hardware -Url: http://www.docker.com -%global commit b321d358e6eef9c82fa3f3bb8826dca3724c58c6 -%global tag v%{version} -Source0: https://github.com/containerd/containerd/archive/%{tag}.tar.gz?/%{oname}-%{version}.tar.gz +URL: https://containerd.io +Source0: https://github.com/containerd/containerd/archive/v%{version}.tar.gz?/%{oname}-%{version}.tar.gz Source1: containerd.service Source2: containerd.toml BuildRequires: glibc-static-devel -BuildRequires: golang +BuildRequires: go BuildRequires: btrfs-devel BuildRequires: pkgconfig(libseccomp) Requires: runc @@ -58,13 +56,13 @@ of containers. %setup -qn %{oname}-%{version} %build -mkdir -p src/%(dirname %{import_path}) -ln -s ../../.. src/%{import_path} -export GOPATH=$(pwd):%{_libdir}/golang -export LDFLAGS="-X %{import_path}/version.Package=%{import_path} -X %{import_path}/version.Version=%{tag} -X %{import_path}/version.Revision=%{commit}" -go build -o bin/containerd %{import_path}/cmd/containerd -go build -o bin/containerd-shim %{import_path}/cmd/containerd-shim -go build -o bin/ctr %{import_path}/cmd/ctr +#mkdir -p src/%(dirname %{import_path}) +#ln -s ../../.. src/%{import_path} +#export GOPATH=$(pwd):%{_libdir}/golang +export LDFLAGS="-s w -X %{import_path}/version.Package=%{import_path} -X %{import_path}/version.Version=%{version} -X %{import_path}/version.Revision=" +go build -o bin/containerd ./cmd/containerd +go build -o bin/containerd-shim ./cmd/containerd-shim +go build -o bin/ctr ./cmd/ctr %install install -D -m 0755 bin/containerd %{buildroot}%{_bindir}/containerd