cleanups; seems working; rel 1

[packages/docker.git] / docker.spec

diff --git a/docker.spec b/docker.spec
index 339f913afd7e5e4abf32b350beba4bbc09c9d55b..016d6b6491df4417f53fb6367794745910f45a3c 100644 (file)
--- a/docker.spec
+++ b/docker.spec
@@ -1,21 +1,29 @@
 #
 # 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
 Summary:       Docker: the open-source application container engine
 Name:          docker
-Version:       1.11.2
-Release:       0.1
+Version:       1.12.0
+Release:       1
 License:       Apache v2.0
 Group:         Applications/System
 Source0:       https://github.com/docker/docker/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: ada4a756f71886049ad793cab8787de8
-Source1:       %{name}.sh
+# Source0-md5: 7990440b022e93f3e7036bcfd12970f2
+Source1:       https://github.com/opencontainers/runc/archive/%{runc_commit}/runc-%{runc_commit}.tar.gz
+# Source1-md5: 716d0b284ce42490eeb83befba10fafb
+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
@@ -41,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
@@ -104,16 +111,30 @@ 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
+
+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}"
 
+# 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
@@ -121,16 +142,26 @@ man/md2man-all.sh
 
 %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,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
+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-containerd-ctr
 
-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
+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
 
 # install udev rules
 install -d $RPM_BUILD_ROOT/lib/udev/rules.d
@@ -174,17 +205,23 @@ 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) %{_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}/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/tmp
 %dir %attr(700,root,root) /var/lib/docker/trust
 %dir %attr(700,root,root) /var/lib/docker/vfs