X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdocker.git;a=blobdiff_plain;f=docker.spec;h=3722ed8210e7d187da16d00fc5189ec7e2cdd115;hp=3d63fb37623b575c438ae7c4732c763e2c07dabc;hb=a75f03e660411bfab3c024dd4b7b2471161a5f8d;hpb=98243dc39f59763831f2810c9085bab5943d4150 diff --git a/docker.spec b/docker.spec index 3d63fb3..3722ed8 100644 --- a/docker.spec +++ b/docker.spec @@ -7,46 +7,52 @@ # NOTES # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies -# v1.0.0-rc1-39-gcc29e3d -%define runc_commit cc29e3d -# v0.2.0-125-g0ac3cd1 -%define containerd_commit 0ac3cd1 -%define subver -rc2 +# v1.0.0-rc2-123-gac031b5 +%define runc_commit ac031b5 +# v0.2.3-66-g8517738 +%define containerd_commit 8517738 +# v0.8.0-dev.2-464-g0f53435 +%define libnetwork_commit 0f53435 +%define subver -rc1 Summary: Docker: the open-source application container engine Name: docker -Version: 1.12.1 +Version: 1.13.0 Release: 0.1 License: Apache v2.0 Group: Applications/System # https://github.com/docker/docker/releases Source0: https://github.com/docker/docker/archive/v%{version}%{subver}/%{name}-%{version}%{subver}.tar.gz -# Source0-md5: adb8bd35ea7cf2991aefc38773da07e9 -Source1: https://github.com/opencontainers/runc/archive/%{runc_commit}/runc-%{runc_commit}.tar.gz -# Source1-md5: 716d0b284ce42490eeb83befba10fafb +# Source0-md5: 3e40a95c40182314a5c2ba41f5b7d7d2 +Source1: https://github.com/docker/runc/archive/%{runc_commit}/runc-%{runc_commit}.tar.gz +# Source1-md5: 5c22c984bb610dbcd57d11c83125f376 Source2: https://github.com/docker/containerd/archive/%{containerd_commit}/containerd-%{containerd_commit}.tar.gz -# Source2-md5: f0a0c1101ad259b84fb457c8c7036723 -Source4: %{name}.sh -Source5: %{name}.service -Source6: %{name}.socket +# Source2-md5: f5f0654554164fe3e3433e41955b64f9 +Source3: https://github.com/docker/libnetwork/archive/%{libnetwork_commit}/libnetwork-%{libnetwork_commit}.tar.gz +# Source3-md5: 7cfbfe76355aae3577c77a6a4b2c92db +Source4: %{name}d.sh Source7: %{name}.init Source8: %{name}.sysconfig +Patch0: systemd.patch URL: http://www.docker.com/ BuildRequires: btrfs-progs-devel >= 3.16.1 BuildRequires: device-mapper-devel >= 2.02.89 BuildRequires: golang >= 1.6 BuildRequires: libseccomp-devel >= 2.2.1 -BuildRequires: rpmbuild(macros) >= 1.228 +BuildRequires: rpmbuild(macros) >= 1.644 BuildRequires: sqlite3-devel >= 3.7.9 Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd +Requires: ca-certificates Requires: iproute2 >= 3.5 Requires: iptables Requires: rc-scripts >= 0.4.0.10 +Requires: systemd-units >= 38 Requires: tar >= 1:1.26 Requires: uname(release) >= 3.8 Requires: xz +Suggests: docker-credential-helpers Suggests: git-core >= 1.7 Suggests: libcgroup Suggests: xz >= 1:4.9 @@ -130,30 +136,38 @@ BuildArch: noarch This plugin provides syntax highlighting in Dockerfile. %prep -%setup -q %{?subver:-n %{name}-%{version}%{subver}} -a1 -a2 - +%setup -q %{?subver:-n %{name}-%{version}%{subver}} -a1 -a2 -a3 mv runc-%{runc_commit}* runc mv containerd-%{containerd_commit}* containerd +mv libnetwork-%{libnetwork_commit}* libnetwork +%patch0 -p1 install -d vendor/src/github.com/docker ln -s $(pwd) vendor/src/github.com/docker/docker ln -s $(pwd)/containerd containerd/vendor/src/github.com/docker/containerd +ln -s $(pwd)/libnetwork vendor/src/github.com/docker/libnetwork %build -v=$(awk '/ENV RUNC_COMMIT/ {print $3}' Dockerfile) +v=$(awk -F= '/RUNC_COMMIT/ {print $2}' hack/dockerfile/binaries-commits) echo "$v" | grep "^%{runc_commit}" -v=$(awk '/ENV CONTAINERD_COMMIT/ {print $3}' Dockerfile) +v=$(awk -F= '/CONTAINERD_COMMIT/ {print $2}' hack/dockerfile/binaries-commits) echo "$v" | grep "^%{containerd_commit}" +v=$(awk -F= '/LIBNETWORK_COMMIT/ {print $2}' hack/dockerfile/binaries-commits) +echo "$v" | grep "^%{libnetwork_commit}" export GOPATH=$(pwd)/vendor:$(pwd)/containerd/vendor export DOCKER_GITCOMMIT="pld/%{version}" - # build docker-runc %{__make} -C runc # build docker-containerd %{__make} -C containerd +# build docker-proxy +go build -ldflags="$PROXY_LDFLAGS" \ + -o docker-proxy \ + github.com/docker/libnetwork/cmd/proxy + bash -x hack/make.sh dynbinary %if %{with doc} man/md2man-all.sh @@ -166,7 +180,6 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man1,/etc/{rc.d/ini $RPM_BUILD_ROOT/var/lib/docker/{containers,execdriver,graph,image,init,network,swarm,tmp,trust,vfs,volumes} install -p bundles/%{version}%{?subver}/dynbinary-client/docker-%{version}%{?subver} $RPM_BUILD_ROOT%{_bindir}/docker -install -p bundles/%{version}%{?subver}/dynbinary-daemon/docker-proxy-%{version}%{?subver} $RPM_BUILD_ROOT%{_sbindir}/docker-proxy install -p bundles/%{version}%{?subver}/dynbinary-daemon/dockerd-%{version}%{?subver} $RPM_BUILD_ROOT%{_sbindir}/dockerd # install docker-runc @@ -177,10 +190,13 @@ install -p containerd/bin/containerd $RPM_BUILD_ROOT%{_sbindir}/docker-container install -p containerd/bin/containerd-shim $RPM_BUILD_ROOT%{_sbindir}/docker-containerd-shim install -p containerd/bin/ctr $RPM_BUILD_ROOT%{_sbindir}/docker-containerd-ctr -cp -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir} -cp -p %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir} +# install docker-proxy +install -p docker-proxy $RPM_BUILD_ROOT%{_sbindir}/docker-proxy + +cp -p contrib/init/systemd/docker.service $RPM_BUILD_ROOT%{systemdunitdir} +cp -p contrib/init/systemd/docker.socket $RPM_BUILD_ROOT%{systemdunitdir} install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/docker -install -p %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/docker +install -p %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/dockerd cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/docker # install udev rules @@ -236,7 +252,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_sbindir}/docker-proxy %attr(755,root,root) %{_sbindir}/docker-runc %attr(755,root,root) %{_sbindir}/dockerd -%attr(755,root,root) %{_libexecdir}/docker +%attr(755,root,root) %{_libexecdir}/dockerd %{systemdunitdir}/docker.service %{systemdunitdir}/docker.socket /lib/udev/rules.d/80-docker.rules