Change-Id: If8aef353a254f970a4ef8aa59f0401775b7d69c7
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6736
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
Summary: Docker |
| 5 | 5 |
Name: docker |
| 6 | 6 |
Version: 18.06.2 |
| 7 |
-Release: 1%{?dist}
|
|
| 7 |
+Release: 2%{?dist}
|
|
| 8 | 8 |
License: ASL 2.0 |
| 9 | 9 |
URL: http://docs.docker.com |
| 10 | 10 |
Group: Applications/File |
| ... | ... |
@@ -83,7 +83,7 @@ for component in tini "proxy dynamic" "runc all" "containerd dynamic"; do |
| 83 | 83 |
hack/dockerfile/install/install.sh $component |
| 84 | 84 |
done |
| 85 | 85 |
DOCKER_BUILDTAGS="pkcs11 seccomp apparmor exclude_graphdriver_aufs" \ |
| 86 |
-VERSION=%{version} DOCKER_GITCOMMIT=${GIT_COMMIT_SHORT} PRODUCT=docker hack/make.sh dynbinary
|
|
| 86 |
+VERSION=%{version}-ce DOCKER_GITCOMMIT=${GIT_COMMIT_SHORT} PRODUCT=docker hack/make.sh dynbinary
|
|
| 87 | 87 |
popd |
| 88 | 88 |
|
| 89 | 89 |
%install |
| ... | ... |
@@ -216,6 +216,8 @@ rm -rf %{buildroot}/*
|
| 216 | 216 |
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
|
| 217 | 217 |
|
| 218 | 218 |
%changelog |
| 219 |
+* Thu Feb 14 2019 Bo Gan <ganb@vmware.com> 18.06.2-2 |
|
| 220 |
+- Fix docker version string |
|
| 219 | 221 |
* Mon Feb 11 2019 Him Kalyan Bordoloi <bordoloih@vmware.com> 18.06.2-1 |
| 220 | 222 |
- Upgrade Docker to fix CVE-2019-5736 |
| 221 | 223 |
* Mon Jan 21 2019 Bo Gan <ganb@vmware.com> 18.06.1-2 |