X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdocker.git;a=blobdiff_plain;f=docker.spec;h=77359a7df4736aa206479d6c776031a6ae04ff10;hp=d45f50f7e4ff1c880aa3b9e6e10a261f49e87fdf;hb=2f0bdd5cbde37fa87a0809b26f76aa7689d3d8a6;hpb=07345fb5aab0c47733aea1ad93dbdc67fd858915 diff --git a/docker.spec b/docker.spec index d45f50f..77359a7 100644 --- a/docker.spec +++ b/docker.spec @@ -1,49 +1,54 @@ # # 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-rc1-39-gcc29e3d -%define runc_commit cc29e3d -# v0.2.0-125-g0ac3cd1 -%define containerd_commit 0ac3cd1 +# v1.0.0-rc2-9-g50a19c6 +%define runc_commit 50a19c6 +# v0.2.4-10-g2a5e70c +%define containerd_commit 2a5e70c +#define subver -rc2 Summary: Docker: the open-source application container engine Name: docker -Version: 1.12.0 -Release: 0.2 +Version: 1.12.6 +Release: 1 License: Apache v2.0 Group: Applications/System +# https://github.com/docker/docker/releases Source0: https://github.com/docker/docker/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 7990440b022e93f3e7036bcfd12970f2 -Source1: https://github.com/opencontainers/runc/archive/%{runc_commit}/runc-%{runc_commit}.tar.gz -# Source1-md5: 716d0b284ce42490eeb83befba10fafb +# Source0-md5: 2db317ab9811641449784fe0fb29d74f +Source1: https://github.com/docker/runc/archive/%{runc_commit}/runc-%{runc_commit}.tar.gz +# Source1-md5: b8f0f19983f641c53a997a58b37dc63e 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}.init -Source7: %{name}.sysconfig +# Source2-md5: 143556e1e7a4e8fa678dce1e0b766e12 +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 @@ -56,6 +61,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 @@ -97,6 +103,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 @@ -112,9 +133,9 @@ This plugin provides syntax highlighting in Dockerfile. %prep %setup -q %{?subver:-n %{name}-%{version}%{subver}} -a1 -a2 - mv runc-%{runc_commit}* runc mv containerd-%{containerd_commit}* containerd +%patch0 -p1 install -d vendor/src/github.com/docker ln -s $(pwd) vendor/src/github.com/docker/docker @@ -144,7 +165,7 @@ man/md2man-all.sh rm -rf $RPM_BUILD_ROOT 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/{containers,execdriver,graph,image,init,network,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/docker-proxy-%{version}%{?subver} $RPM_BUILD_ROOT%{_sbindir}/docker-proxy @@ -156,21 +177,23 @@ install -p runc/runc $RPM_BUILD_ROOT%{_sbindir}/docker-runc # 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-ctr +install -p containerd/bin/ctr $RPM_BUILD_ROOT%{_sbindir}/docker-containerd-ctr -cp -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir} -install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/docker -install -p %{SOURCE4} $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 +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} @@ -185,17 +208,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 @@ -207,16 +233,15 @@ rm -rf $RPM_BUILD_ROOT %attr(754,root,root) /etc/rc.d/init.d/docker %attr(755,root,root) %{_bindir}/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-ctr %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 -#%{_mandir}/man1/lxc-docker.1* - %dir %attr(700,root,root) /var/lib/docker %dir %attr(700,root,root) /var/lib/docker/containers @@ -225,6 +250,7 @@ rm -rf $RPM_BUILD_ROOT %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 @@ -234,6 +260,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)