Browse code
Fixing runc version problem, Github issue # 640
Change-Id: Ie49585f1574ca0bb99e3480bcf7ca1e5857afcd1
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2618
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Kumar Kaushik authored on 2017/05/04 10:16:10Showing 1 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Docker |
| 2 | 2 |
Name: docker |
| 3 | 3 |
Version: 1.13.1 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?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 |
| ... | ... |
@@ -25,6 +25,7 @@ BuildRequires: device-mapper-devel |
| 25 | 25 |
BuildRequires: btrfs-progs-devel |
| 26 | 26 |
BuildRequires: libseccomp |
| 27 | 27 |
BuildRequires: libseccomp-devel |
| 28 |
+BuildRequires: unzip |
|
| 28 | 29 |
Requires: libgcc |
| 29 | 30 |
Requires: glibc |
| 30 | 31 |
Requires: libseccomp |
| ... | ... |
@@ -57,8 +58,8 @@ make |
| 57 | 57 |
|
| 58 | 58 |
mkdir -p /usr/share/gocode/src/github.com/opencontainers/ |
| 59 | 59 |
cd /usr/share/gocode/src/github.com/opencontainers/ |
| 60 |
-mv /usr/src/photon/BUILD/docker-1.13.1/runc-1.0.0-rc2 . |
|
| 61 |
-mv runc-1.0.0-rc2 runc |
|
| 60 |
+mv /usr/src/photon/BUILD/docker-1.13.1/runc-9df8b306d01f59d3a8029be411de015b7304dd8f . |
|
| 61 |
+mv runc-9df8b306d01f59d3a8029be411de015b7304dd8f runc |
|
| 62 | 62 |
cd runc |
| 63 | 63 |
make BUILDTAGS='seccomp' |
| 64 | 64 |
|
| ... | ... |
@@ -93,7 +94,7 @@ install -m 0644 %{SOURCE6} %{buildroot}%{_datadir}/bash-completion/completions/d
|
| 93 | 93 |
/sbin/ldconfig |
| 94 | 94 |
|
| 95 | 95 |
if [ $1 -eq 1 ] ; then |
| 96 |
- getent group docker >/dev/null || groupadd -r docker |
|
| 96 |
+ getent group docker >/dev/null || groupadd -r docker |
|
| 97 | 97 |
fi |
| 98 | 98 |
|
| 99 | 99 |
%postun |
| ... | ... |
@@ -125,6 +126,8 @@ rm -rf %{buildroot}/*
|
| 125 | 125 |
/usr/share/bash-completion/completions/docker |
| 126 | 126 |
|
| 127 | 127 |
%changelog |
| 128 |
+* Wed May 03 2017 Kumar Kaushik <kaushikk@vmware.com> 1.13.1-3 |
|
| 129 |
+- Fixing docker plugin runc version github issue # 640. |
|
| 128 | 130 |
* Mon Apr 24 2017 Kumar Kaushik <kaushikk@vmware.com> 1.13.1-2 |
| 129 | 131 |
- Adding docker group for non-sudo users, GitHub issue # 207. |
| 130 | 132 |
* Tue Apr 11 2017 Kumar Kaushik <kaushikk@vmware.com> 1.13.1-1 |