Change-Id: Ic914b72541c8c32920e8a241bf8562f58043cdcc
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5045
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
%define __os_install_post %{nil}
|
| 4 | 4 |
Summary: Docker |
| 5 | 5 |
Name: docker |
| 6 |
-Version: 17.12.1 |
|
| 6 |
+Version: 18.03.0 |
|
| 7 | 7 |
Release: 1%{?dist}
|
| 8 | 8 |
License: ASL 2.0 |
| 9 | 9 |
URL: http://docs.docker.com |
| ... | ... |
@@ -11,8 +11,8 @@ Group: Applications/File |
| 11 | 11 |
Vendor: VMware, Inc. |
| 12 | 12 |
Distribution: Photon |
| 13 | 13 |
Source0: https://github.com/docker/docker-ce/archive/docker-%{version}-ce.tar.gz
|
| 14 |
-%define sha1 docker=e93e57fb285998dd21e98d7abd22fec473cc7da2 |
|
| 15 |
-%define DOCKER_GITCOMMIT 7390fc6103da41cf98ae66cfac80fa143268bf60 |
|
| 14 |
+%define sha1 docker=873472d4b722aaf0e000ba0d0b1fa3d63d276ffc |
|
| 15 |
+%define DOCKER_GITCOMMIT 0520e243029d1361649afb0706a1c5d9a1c012b8 |
|
| 16 | 16 |
Source99: default-disable.preset |
| 17 | 17 |
Patch99: remove-firewalld.patch |
| 18 | 18 |
|
| ... | ... |
@@ -74,9 +74,9 @@ DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=%{version} GITCOMMIT=${GIT_COMMIT_
|
| 74 | 74 |
popd |
| 75 | 75 |
|
| 76 | 76 |
pushd docker |
| 77 |
-for component in runc-dynamic containerd-dynamic proxy-dynamic tini; do |
|
| 77 |
+for component in tini "proxy dynamic" "runc all" "containerd dynamic"; do |
|
| 78 | 78 |
RUNC_BUILDTAGS="seccomp" \ |
| 79 |
- hack/dockerfile/install-binaries.sh $component |
|
| 79 |
+ hack/dockerfile/install/install.sh $component |
|
| 80 | 80 |
done |
| 81 | 81 |
DOCKER_BUILDTAGS="pkcs11 seccomp exclude_graphdriver_aufs" \ |
| 82 | 82 |
VERSION=%{version} DOCKER_GITCOMMIT=${GIT_COMMIT_SHORT} hack/make.sh dynbinary
|
| ... | ... |
@@ -188,6 +188,8 @@ rm -rf %{buildroot}/*
|
| 188 | 188 |
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
|
| 189 | 189 |
|
| 190 | 190 |
%changelog |
| 191 |
+* Mon Apr 09 2018 Bo Gan <ganb@vmware.com> 18.03.0-1 |
|
| 192 |
+- Update to 18.03.0-ce |
|
| 191 | 193 |
* Mon Apr 09 2018 Bo Gan <ganb@vmware.com> 17.12.1-1 |
| 192 | 194 |
- Update to 17.12.1-ce |
| 193 | 195 |
* Mon Apr 09 2018 Bo Gan <ganb@vmware.com> 17.09.1-1 |