Browse code

Fixing runc version problem, Github issue # 640

Change-Id: Ia0ec0028b8e4cf8d05aed387c96996a2ff0369a8
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2619
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>

Kumar Kaushik authored on 2017/05/04 10:38:59
Showing 1 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Docker
2 2
 Name:           docker
3 3
 Version:        1.13.1
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 License:        ASL 2.0
6 6
 URL:            http://docs.docker.com
7 7
 Group:          Applications/File
... ...
@@ -11,8 +11,8 @@ Source0:        https://github.com/docker/docker/archive/%{name}-%{version}.tar.
11 11
 %define sha1 docker=8a39c44c9e665495484fd86fbefdfbc9ab9d815d 
12 12
 Source1:        https://github.com/docker/containerd/archive/containerd-0.2.5.tar.gz
13 13
 %define sha1 containerd=aaf6fd1c5176b8575af1d8edf82af3d733528451
14
-Source2:        https://github.com/opencontainers/runc/archive/runc-1.0.0-rc2.tar.gz
15
-%define sha1 runc=27ab28ba1c81c4f2f62ed11601f8e3a2fafd229f
14
+Source2:        https://github.com/opencontainers/runc/tree/runc-1.0.0-rc2-9df8b306d01f59d3a8029be411de015b7304dd8f.zip
15
+%define sha1 runc=8f66277f75bafebe564226d8a3107a19d60b3237
16 16
 Source3:        https://github.com/docker/libnetwork/archive/docker-libnetwork-master-0.8.1.tar.gz
17 17
 %define sha1 docker-libnetwork-master=231c59f72a17f5e3f33e75e1efa164623e1852d8
18 18
 Source4:        docker.service
... ...
@@ -24,6 +24,7 @@ BuildRequires:  device-mapper-devel
24 24
 BuildRequires:  btrfs-progs-devel
25 25
 BuildRequires:  libseccomp
26 26
 BuildRequires:  libseccomp-devel
27
+BuildRequires:  unzip
27 28
 Requires:       libgcc
28 29
 Requires:       glibc
29 30
 Requires:       libseccomp
... ...
@@ -56,8 +57,8 @@ make
56 56
 
57 57
 mkdir -p /usr/share/gocode/src/github.com/opencontainers/
58 58
 cd /usr/share/gocode/src/github.com/opencontainers/
59
-mv /usr/src/photon/BUILD/docker-1.13.1/runc-1.0.0-rc2 .
60
-mv runc-1.0.0-rc2 runc
59
+mv /usr/src/photon/BUILD/docker-1.13.1/runc-9df8b306d01f59d3a8029be411de015b7304dd8f .
60
+mv runc-9df8b306d01f59d3a8029be411de015b7304dd8f runc
61 61
 cd runc
62 62
 make BUILDTAGS='seccomp'
63 63
 
... ...
@@ -83,6 +84,7 @@ install -vdm 755 %{buildroot}%{_datadir}/bash-completion/completions
83 83
 install -m 0644 %{SOURCE6} %{buildroot}%{_datadir}/bash-completion/completions/docker
84 84
 
85 85
 %{_fixperms} %{buildroot}/*
86
+
86 87
 %check
87 88
 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
88 89
 
... ...
@@ -93,11 +95,20 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
93 93
 %post
94 94
 /sbin/ldconfig
95 95
 
96
+if [ $1 -eq 1 ] ; then
97
+    getent group  docker  >/dev/null || groupadd -r docker
98
+fi
99
+
96 100
 %postun
97 101
 /sbin/ldconfig
98 102
 %systemd_postun_with_restart docker-containerd.service
99 103
 %systemd_postun_with_restart docker.service
100 104
 
105
+if [ $1 -eq 0 ] ; then
106
+    if getent group docker >/dev/null; then
107
+        groupdel docker
108
+    fi
109
+fi
101 110
 
102 111
 %clean
103 112
 rm -rf %{buildroot}/*
... ...
@@ -117,6 +128,9 @@ rm -rf %{buildroot}/*
117 117
 /usr/share/bash-completion/completions/docker
118 118
 
119 119
 %changelog
120
+*   Wed May 03 2017 Kumar Kaushik <kaushikk@vmware.com> 1.13.1-2
121
+-   Fixing docker plugin runc version github issue # 640.
122
+-   Adding docker group for non-sudo users, GitHub issue # 207.
120 123
 *   Tue Apr 11 2017 Kumar Kaushik <kaushikk@vmware.com> 1.13.1-1
121 124
 -   Building docker from source.
122 125
 *   Fri Jan 13 2017 Xiaolin Li <xiaolinl@vmware.com> 1.12.6-1