Browse code

Revert "Building docker from source"

This reverts commit 380a2c31e35139d1f7c7661a00abe8b836ff99f2.

Change-Id: I52fe968c41b0c8b88acbbd60b4af675d2fcf3e9c
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2364
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>
Tested-by: Divya Thaluru <dthaluru@vmware.com>

Kumar Kaushik authored on 2017/04/11 10:15:09
Showing 1 changed files
... ...
@@ -1,75 +1,33 @@
1 1
 Summary:        Docker
2 2
 Name:           docker
3
-Version:        1.13.1
3
+Version:        1.12.6
4 4
 Release:        1%{?dist}
5 5
 License:        ASL 2.0
6 6
 URL:            http://docs.docker.com
7 7
 Group:          Applications/File
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10
-Source0:        https://github.com/docker/docker/archive/%{name}-%{version}.tar.gz
11
-%define sha1 docker=8a39c44c9e665495484fd86fbefdfbc9ab9d815d 
12
-Source1:        https://github.com/docker/containerd/archive/containerd-0.2.5.tar.gz
13
-%define sha1 containerd=aaf6fd1c5176b8575af1d8edf82af3d733528451
14
-Source2:        https://github.com/opencontainers/runc/archive/runc-1.0.0-rc3.tar.gz
15
-%define sha1 runc=57d56045794ea107b76d21d105c697b76ba93fb7
16
-Source3:        docker.service
17
-Source4:        docker-containerd.service
18
-Source5:        docker-completion.bash
19
-BuildRequires:  glibc
20
-BuildRequires:  systemd-devel
21
-BuildRequires:  device-mapper-devel
22
-BuildRequires:  glibc-devel
23
-BuildRequires:  btrfs-progs-devel
24
-BuildRequires:  go
25
-BuildRequires:  libseccomp
26
-BuildRequires:  libseccomp-devel
10
+Source0:        https://get.docker.com/builds/Linux/x86_64/%{name}-%{version}.tgz 
11
+%define sha1 docker=53e47bc1c888279753c474c7c75c4e6756422165
12
+Source1:        docker.service
13
+Source2:        docker-containerd.service
14
+Source3:        docker-completion.bash
15
+BuildRequires:  systemd
27 16
 Requires:       systemd
28 17
 
29 18
 %description
30 19
 Docker is a platform for developers and sysadmins to develop, ship and run applications.
31 20
 %prep
32
-%setup -q
33
-%setup -T -D -a 1
34
-%setup -T -D -a 2
35
-
21
+%setup -qn docker
36 22
 %build
37
-
38
-export AUTO_GOPATH=1
39
-export DOCKER_BUILDTAGS='exclude_graphdriver_aufs'
40
-export DOCKER_GITCOMMIT="092cba3"
41
-
42
-./hack/make.sh dynbinary
43
-
44
-mkdir -p /usr/share/gocode/src/github.com/docker/
45
-cd /usr/share/gocode/src/github.com/docker/
46
-mv /usr/src/photon/BUILD/docker-1.13.1/containerd-0.2.5 .
47
-mv containerd-0.2.5 containerd
48
-cd containerd
49
-
50
-make
51
-
52
-mkdir -p /usr/share/gocode/src/github.com/opencontainers/
53
-cd /usr/share/gocode/src/github.com/opencontainers/
54
-mv /usr/src/photon/BUILD/docker-1.13.1/runc-1.0.0-rc3 .
55
-mv runc-1.0.0-rc3 runc
56
-cd runc
57
-make
58
-
59
-
60 23
 %install
61 24
 install -vdm755 %{buildroot}/usr/bin
62
-mv -v %{_builddir}/%{name}-%{version}/bundles/latest/dynbinary-client/%{name}-%{version} %{buildroot}/usr/bin/%{name}
63
-mv -v %{_builddir}/%{name}-%{version}/bundles/latest/dynbinary-daemon/%{name}d-%{version} %{buildroot}/usr/bin/%{name}d
64
-mv -v /usr/share/gocode/src/github.com/docker/containerd/bin/containerd %{buildroot}/usr/bin/%{name}-containerd
65
-mv -v /usr/share/gocode/src/github.com/docker/containerd/bin/containerd-shim %{buildroot}/usr/bin/%{name}-containerd-shim
66
-mv -v /usr/share/gocode/src/github.com/docker/containerd/bin/ctr %{buildroot}/usr/bin/%{name}-containerd-ctr
67
-mv -v /usr/share/gocode/src/github.com/opencontainers/runc %{buildroot}/usr/bin/%{name}-runc
25
+mv -v %{_builddir}/%{name}/* %{buildroot}/usr/bin/
68 26
 install -vd %{buildroot}/lib/systemd/system
69
-cp %{SOURCE3} %{buildroot}/lib/systemd/system/docker.service
70
-cp %{SOURCE4} %{buildroot}/lib/systemd/system/docker-containerd.service
27
+cp %{SOURCE1} %{buildroot}/lib/systemd/system/docker.service
28
+cp %{SOURCE2} %{buildroot}/lib/systemd/system/docker-containerd.service
71 29
 install -vdm 755 %{buildroot}%{_datadir}/bash-completion/completions
72
-install -m 0644 %{SOURCE5} %{buildroot}%{_datadir}/bash-completion/completions/docker
30
+install -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/bash-completion/completions/docker
73 31
 
74 32
 %{_fixperms} %{buildroot}/*
75 33
 
... ...
@@ -96,8 +54,6 @@ rm -rf %{buildroot}/*
96 96
 %{_datadir}/bash-completion/completions/docker
97 97
 
98 98
 %changelog
99
-*   Thu Apr 06 2017 Kumar Kaushik <kaushikk@vmware.com> 1.13.1-1
100
--   Building docker from source.
101 99
 *   Fri Jan 13 2017 Xiaolin Li <xiaolinl@vmware.com> 1.12.6-1
102 100
 -   Upgraded to version 1.12.6
103 101
 *   Wed Sep 21 2016 Xiaolin Li <xiaolinl@vmware.com> 1.12.1-1
... ...
@@ -135,5 +91,5 @@ rm -rf %{buildroot}/*
135 135
 -   Update according to UsrMove.
136 136
 *   Fri May 15 2015 Divya Thaluru <dthaluru@vmware.com> 1.6.0-2
137 137
 -   Updated to version 1.6
138
-*   Wed Mar 4 2015 Divya Thaluru <dthaluru@vmware.com> 1.5.0-1
138
+*   Mon Mar 4 2015 Divya Thaluru <dthaluru@vmware.com> 1.5.0-1
139 139
 -   Initial build. First version