]> git.pld-linux.org Git - packages/docker.git/blobdiff - docker.spec
drop lxc-docker-nosha.patch
[packages/docker.git] / docker.spec
index cbb2b4b4a5fe30499e64dccda3de5a9a0e578da4..3282c6275a776525afe45a4d00365687125ea7bd 100644 (file)
@@ -1,22 +1,37 @@
 #
 # Conditional build:
 %bcond_with    tests           # build without tests
+%bcond_with    vim                     # build vim syntax package
+%bcond_with    doc                     # build manual pages
 
+# NOTES
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+
+# v0.1.1
+%define        runc_commit baf6536
+# v0.2.2
+%define        containerd_commit 9dc2b32
 Summary:       Docker: the open-source application container engine
 Name:          docker
-Version:       1.6.2
-Release:       1
+Version:       1.11.2
+Release:       0.8
 License:       Apache v2.0
 Group:         Applications/System
 Source0:       https://github.com/docker/docker/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 81a1a015ec0520d739ec721f8295d94f
+# Source0-md5: ada4a756f71886049ad793cab8787de8
+Source1:       https://github.com/opencontainers/runc/archive/%{runc_commit}/runc-%{runc_commit}.tar.gz
+# Source1-md5: b6b2f2e5722666e7d1a1d5062ff996e3
+Source2:       https://github.com/docker/containerd/archive/%{containerd_commit}/containerd-%{containerd_commit}.tar.gz
+# Source2-md5: 76c1e68052b35a3dcfbc6d76d61f17cd
+Source4:       %{name}.sh
 Source5:       %{name}.service
 Source6:       %{name}.init
 Source7:       %{name}.sysconfig
-URL:           https://github.com/docker/docker
-BuildRequires: btrfs-progs-devel
-BuildRequires: device-mapper-devel
-BuildRequires: golang >= 1.3.1
+URL:           http://www.docker.com/
+BuildRequires: btrfs-progs-devel >= 3.16.1
+BuildRequires: device-mapper-devel >= 2.02.89
+BuildRequires: golang >= 1.4
+BuildRequires: libseccomp-devel >= 2.2.1
 BuildRequires: rpmbuild(macros) >= 1.228
 BuildRequires: sqlite3-devel >= 3.7.9
 Requires(post,preun):  /sbin/chkconfig
@@ -34,7 +49,6 @@ 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
@@ -43,6 +57,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                bash_compdir    %{_datadir}/bash-completion/completions
 %define                _vimdatadir             %{_datadir}/vim
+%define                _libexecdir             %{_prefix}/lib
 
 # binary stripped or something
 %define                _enable_debug_packages 0
@@ -96,27 +111,54 @@ BuildArch: noarch
 This plugin provides syntax highlighting in Dockerfile.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -a1 -a2
+
+mv runc-%{runc_commit}* runc
+mv containerd-%{containerd_commit}* containerd
 
 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
 
 %build
-export GOPATH=$(pwd)/vendor
+v=$(awk '/ENV RUNC_COMMIT/ {print $3}' Dockerfile)
+echo "$v" | grep "^%{runc_commit}"
+v=$(awk '/ENV CONTAINERD_COMMIT/ {print $3}' Dockerfile)
+echo "$v" | grep "^%{containerd_commit}"
+
+export GOPATH=$(pwd)/vendor:$(pwd)/containerd/vendor
 export DOCKER_GITCOMMIT="pld/%{version}"
 
-DEBUG=1 hack/make.sh dynbinary
+# build docker-runc
+%{__make} -C runc
+
+# build docker-containerd
+%{__make} -C containerd
+
+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}} \
-       $RPM_BUILD_ROOT/var/lib/docker/{aufs,containers,execdriver,graph,init,tmp,trust,vfs,volumes}
+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,image,init,network,overlay,tmp,trust,vfs,volumes}
 
 install -p bundles/%{version}/dynbinary/docker-%{version} $RPM_BUILD_ROOT%{_bindir}/docker
-install -p bundles/%{version}/dynbinary/dockerinit-%{version} $RPM_BUILD_ROOT%{_bindir}/dockerinit
+
+# install docker-runc
+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
+
 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
 
@@ -129,9 +171,11 @@ install -d $RPM_BUILD_ROOT%{bash_compdir}
 cp -p contrib/completion/bash/docker $RPM_BUILD_ROOT%{bash_compdir}/docker
 
 # vim syntax
+%if %{with vim}
 install -d $RPM_BUILD_ROOT%{_vimdatadir}
 cp -a contrib/syntax/vim/* $RPM_BUILD_ROOT%{_vimdatadir}
 %{__rm} $RPM_BUILD_ROOT%{_vimdatadir}/{LICENSE,README.md}
+%endif
 
 %pre
 %groupadd -g 296 docker
@@ -160,17 +204,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) %{_bindir}/dockerinit
+%attr(755,root,root) %{_sbindir}/docker-runc
+%attr(755,root,root) %{_sbindir}/docker-containerd
+%attr(755,root,root) %{_sbindir}/docker-containerd-shim
+%attr(755,root,root) %{_sbindir}/docker-ctr
+%attr(755,root,root) %{_libexecdir}/docker
 %{systemdunitdir}/docker.service
 /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/overlay
 %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
@@ -180,9 +232,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{bash_compdir}/docker
 
+%if %{with vim}
 %files -n vim-syntax-%{name}
 %defattr(644,root,root,755)
 %doc contrib/syntax/vim/{README.md,LICENSE}
 %{_vimdatadir}/doc/dockerfile.txt
 %{_vimdatadir}/ftdetect/dockerfile.vim
 %{_vimdatadir}/syntax/dockerfile.vim
+%endif
This page took 0.049211 seconds and 4 git commands to generate.