X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdocker.git;a=blobdiff_plain;f=docker.spec;h=3722ed8210e7d187da16d00fc5189ec7e2cdd115;hp=1e97aab3dfad4e65e0b196d73a1f4317b79bf2af;hb=a75f03e660411bfab3c024dd4b7b2471161a5f8d;hpb=6528d570db9bab8f340e38064613137d3cabb0ef diff --git a/docker.spec b/docker.spec index 1e97aab..3722ed8 100644 --- a/docker.spec +++ b/docker.spec @@ -1,46 +1,63 @@ # # Conditional build: %bcond_with tests # build without tests -%bcond_with vim # build vim syntax package +%bcond_with vim # build vim syntax package (bundled in vim 7.4.979-2) +%bcond_with doc # build manual pages # NOTES # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies +# 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.11.1 +Version: 1.13.0 Release: 0.1 License: Apache v2.0 Group: Applications/System -Source0: https://github.com/docker/docker/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: ec0e32e8ce9e05cc0f2de7a439c1b3ca -Source1: %{name}.sh -Source5: %{name}.service -Source6: %{name}.init -Source7: %{name}.sysconfig +# https://github.com/docker/docker/releases +Source0: https://github.com/docker/docker/archive/v%{version}%{subver}/%{name}-%{version}%{subver}.tar.gz +# 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: 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.4 +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 Provides: group(docker) Obsoletes: lxc-docker < 1.1.1 -Patch0: lxc-%{name}-nosha.patch # only runs on x64 hosts for now: # https://github.com/docker/docker/issues/136 # https://github.com/docker/docker/issues/611 @@ -48,6 +65,7 @@ ExclusiveArch: %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define bash_compdir %{_datadir}/bash-completion/completions +%define zsh_compdir %{_datadir}/zsh/site-functions %define _vimdatadir %{_datadir}/vim %define _libexecdir %{_prefix}/lib @@ -89,6 +107,21 @@ This package provides bash-completion for Docker. %description -n bash-completion-%{name} -l pl.UTF-8 Pakiet ten dostarcza bashowe uzupełnianie nazw dla Dockera. +%package -n zsh-completion-%{name} +Summary: zsh completion for Docker +Summary(pl.UTF-8): Uzupełnianie parametrów w zsh dla poleceń Dockera +Group: Applications/Shells +Requires: %{name} +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif + +%description -n zsh-completion-%{name} +This package provides zsh completion for Docker. + +%description -n zsh-completion-%{name} -l pl.UTF-8 +Pakiet ten dostarcza uzupełnianie w zsh dla poleceń Dockera. + %package -n vim-syntax-%{name} Summary: Vim syntax: Docker Group: Applications/Editors/Vim @@ -103,38 +136,78 @@ BuildArch: noarch This plugin provides syntax highlighting in Dockerfile. %prep -%setup -q -#%patch0 -p1 why is this patch needed? +%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 -export GOPATH=$(pwd)/vendor +v=$(awk -F= '/RUNC_COMMIT/ {print $2}' hack/dockerfile/binaries-commits) +echo "$v" | grep "^%{runc_commit}" +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 -DEBUG=1 hack/make.sh dynbinary +# 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 +%endif %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,/etc/{rc.d/init.d,sysconfig},%{systemdunitdir}} \ +install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man1,/etc/{rc.d/init.d,sysconfig},%{systemdunitdir}} \ $RPM_BUILD_ROOT%{_libexecdir} \ - $RPM_BUILD_ROOT/var/lib/docker/{aufs,containers,execdriver,graph,init,tmp,trust,vfs,volumes} + $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/dockerd-%{version}%{?subver} $RPM_BUILD_ROOT%{_sbindir}/dockerd + +# install docker-runc +install -p runc/runc $RPM_BUILD_ROOT%{_sbindir}/docker-runc -install -p bundles/%{version}/dynbinary/docker-%{version} $RPM_BUILD_ROOT%{_bindir}/docker -cp -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir} -install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/docker -install -p %{SOURCE1} $RPM_BUILD_ROOT%{_libexecdir}/docker -cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/docker -#cp -p packaging/debian/lxc-docker.1 $RPM_BUILD_ROOT%{_mandir}/man1 +# install docker-containerd +install -p containerd/bin/containerd $RPM_BUILD_ROOT%{_sbindir}/docker-containerd +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 + +# 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}/dockerd +cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/docker # install udev rules install -d $RPM_BUILD_ROOT/lib/udev/rules.d cp -p contrib/udev/80-docker.rules $RPM_BUILD_ROOT/lib/udev/rules.d -# bash completion +# bash and zsh completion install -d $RPM_BUILD_ROOT%{bash_compdir} cp -p contrib/completion/bash/docker $RPM_BUILD_ROOT%{bash_compdir}/docker +install -d $RPM_BUILD_ROOT%{zsh_compdir} +cp -p contrib/completion/zsh/_docker $RPM_BUILD_ROOT%{zsh_compdir} # vim syntax %if %{with vim} @@ -149,17 +222,20 @@ cp -a contrib/syntax/vim/* $RPM_BUILD_ROOT%{_vimdatadir} %post /sbin/chkconfig --add %{name} %service -n %{name} restart +%systemd_post %{name}.service %preun if [ "$1" = "0" ]; then %service -q %{name} stop /sbin/chkconfig --del %{name} fi +%systemd_preun %{name}.service %postun if [ "$1" = "0" ]; then %groupremove docker fi +%systemd_reload %clean rm -rf $RPM_BUILD_ROOT @@ -170,17 +246,25 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/docker %attr(754,root,root) /etc/rc.d/init.d/docker %attr(755,root,root) %{_bindir}/docker -%attr(755,root,root) %{_libexecdir}/docker +%attr(755,root,root) %{_sbindir}/docker-containerd +%attr(755,root,root) %{_sbindir}/docker-containerd-ctr +%attr(755,root,root) %{_sbindir}/docker-containerd-shim +%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}/dockerd %{systemdunitdir}/docker.service +%{systemdunitdir}/docker.socket /lib/udev/rules.d/80-docker.rules -#%{_mandir}/man1/lxc-docker.1* %dir %attr(700,root,root) /var/lib/docker -%dir %attr(700,root,root) /var/lib/docker/aufs %dir %attr(700,root,root) /var/lib/docker/containers %dir %attr(700,root,root) /var/lib/docker/execdriver %dir %attr(700,root,root) /var/lib/docker/graph +%dir %attr(700,root,root) /var/lib/docker/image %dir %attr(700,root,root) /var/lib/docker/init +%dir %attr(700,root,root) /var/lib/docker/network +%dir %attr(700,root,root) /var/lib/docker/swarm %dir %attr(700,root,root) /var/lib/docker/tmp %dir %attr(700,root,root) /var/lib/docker/trust %dir %attr(700,root,root) /var/lib/docker/vfs @@ -190,6 +274,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %{bash_compdir}/docker +%files -n zsh-completion-%{name} +%defattr(644,root,root,755) +%{zsh_compdir}/_docker + %if %{with vim} %files -n vim-syntax-%{name} %defattr(644,root,root,755)