Change-Id: I95b599beb0a2c5167a5dbadcb473f2b6cc851b8b
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4989
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
... | ... |
@@ -3,28 +3,16 @@ |
3 | 3 |
%define __os_install_post %{nil} |
4 | 4 |
Summary: Docker |
5 | 5 |
Name: docker |
6 |
-Version: 17.06.0 |
|
7 |
-Release: 4%{?dist} |
|
6 |
+Version: 18.03.0 |
|
7 |
+Release: 1%{?dist} |
|
8 | 8 |
License: ASL 2.0 |
9 | 9 |
URL: http://docs.docker.com |
10 | 10 |
Group: Applications/File |
11 | 11 |
Vendor: VMware, Inc. |
12 | 12 |
Distribution: Photon |
13 |
-#Git commits must be in sync with docker/hack/dockerfile/binaries-commits |
|
14 |
-Source0: https://github.com/docker/moby/archive/docker-ce-02c1d87.tar.gz |
|
15 |
-%define sha1 docker-ce=40deab51330b39d16abc23831063a6123ff0a570 |
|
16 |
-Source1: https://github.com/docker/containerd/tree/containerd-cfb82a8.tar.gz |
|
17 |
-%define sha1 containerd=2adb56ddd2d89af5c6ab649de93c34d421b62649 |
|
18 |
-Source2: https://github.com/docker/runc/tree/runc-2d41c04.tar.gz |
|
19 |
-%define sha1 runc=41cd104b168cef29032c268e0d6de1bad5dadc25 |
|
20 |
-Source3: https://github.com/docker/libnetwork/tree/libnetwork-7b2b1fe.tar.gz |
|
21 |
-%define sha1 libnetwork=0afeb8c802998344753fb933f827427da23975f8 |
|
22 |
-#Source4: https://github.com/docker/cli/tree/cli-3dfb834.tar.gz |
|
23 |
-#%define sha1 cli=9dd33ca7d8e554fe875138000c6767167228e125 |
|
24 |
-Source4: https://github.com/krallin/tini/tree/tini-949e6fa.tar.gz |
|
25 |
-%define sha1 tini=e1a0e72ff74e1486e0701dd52983014777a7d949 |
|
26 |
-Source5: https://github.com/cpuguy83/go-md2man/tree/go-md2man-a65d4d2.tar.gz |
|
27 |
-%define sha1 go-md2man=e3d0865c583150f7c76e385a8b4a3f2432ca8ad8 |
|
13 |
+Source0: https://github.com/docker/docker-ce/archive/docker-%{version}-ce.tar.gz |
|
14 |
+%define sha1 docker=873472d4b722aaf0e000ba0d0b1fa3d63d276ffc |
|
15 |
+%define DOCKER_GITCOMMIT 0520e243029d1361649afb0706a1c5d9a1c012b8 |
|
28 | 16 |
Source6: default-disable.preset |
29 | 17 |
Patch0: remove-firewalld.patch |
30 | 18 |
|
... | ... |
@@ -62,56 +50,42 @@ Documentation and vimfiles for docker |
62 | 62 |
|
63 | 63 |
%prep |
64 | 64 |
%setup -q -c |
65 |
-%setup -T -D -a 1 |
|
66 |
-%setup -T -D -a 2 |
|
67 |
-%setup -T -D -a 3 |
|
68 |
-%setup -T -D -a 4 |
|
69 |
-%setup -T -D -a 5 |
|
70 | 65 |
|
71 |
-ln -s docker-ce/components/cli cli |
|
72 |
-ln -s docker-ce/components/engine engine |
|
73 |
-ln -s docker-ce/components/packaging packaging |
|
66 |
+#ln -s docker-ce/components/cli cli |
|
67 |
+#ln -s docker-ce/components/engine engine |
|
68 |
+#ln -s docker-ce/components/packaging packaging |
|
74 | 69 |
|
75 |
-%patch0 -p2 |
|
70 |
+%patch0 -p1 |
|
76 | 71 |
|
77 | 72 |
mkdir -p /go/src/github.com |
78 | 73 |
cd /go/src/github.com |
79 | 74 |
mkdir opencontainers |
80 |
-mkdir containerd |
|
81 |
-mkdir cpuguy83 |
|
82 | 75 |
mkdir docker |
83 | 76 |
|
84 |
-ln -snrf "$OLDPWD/containerd" containerd/ |
|
85 |
-ln -snrf "$OLDPWD/engine" docker/docker |
|
86 |
-ln -snrf "$OLDPWD/runc" opencontainers/ |
|
87 |
-ln -snrf "$OLDPWD/go-md2man" cpuguy83/ |
|
88 |
-ln -snrf "$OLDPWD/libnetwork" docker/ |
|
89 |
-ln -snrf "$OLDPWD/cli" docker/ |
|
90 |
- |
|
91 |
-ln -snrf "$OLDPWD/tini" /go/ |
|
92 |
- |
|
93 |
-sed -i '/^\s*git clone.*$/d' docker/docker/hack/dockerfile/install-binaries.sh |
|
94 |
- |
|
95 |
-#catch git clone |
|
96 |
-git config --global http.proxy http://localhost:0 |
|
77 |
+ln -snrf "$OLDPWD/components/engine" docker/docker |
|
78 |
+ln -snrf "$OLDPWD/components/cli" docker/cli |
|
97 | 79 |
|
98 | 80 |
%build |
99 | 81 |
|
100 | 82 |
export GOPATH="/go" |
101 | 83 |
export PATH="$PATH:$GOPATH/bin" |
102 | 84 |
|
103 |
-export DOCKER_BUILDTAGS="pkcs11 seccomp exclude_graphdriver_aufs" |
|
104 |
-export RUNC_BUILDTAGS="seccomp" |
|
85 |
+GIT_COMMIT=%{DOCKER_GITCOMMIT} |
|
86 |
+GIT_COMMIT_SHORT=${GIT_COMMIT:0:7} |
|
105 | 87 |
|
106 |
-cd /go/src/github.com |
|
88 |
+cd "$GOPATH/src/github.com/docker" |
|
107 | 89 |
|
108 |
-pushd docker/cli |
|
109 |
-make VERSION="$(cat VERSION)" dynbinary manpages |
|
90 |
+pushd cli |
|
91 |
+DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=%{version} GITCOMMIT=${GIT_COMMIT_SHORT} dynbinary manpages |
|
110 | 92 |
popd |
111 | 93 |
|
112 |
-pushd docker/docker |
|
113 |
-TMP_GOPATH="$GOPATH" ./hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini |
|
114 |
-DOCKER_GITCOMMIT="$(git rev-parse --short HEAD)" ./hack/make.sh dynbinary |
|
94 |
+pushd docker |
|
95 |
+for component in tini "proxy dynamic" "runc all" "containerd dynamic"; do |
|
96 |
+ DOCKER_BUILDTAGS="pkcs11 seccomp exclude_graphdriver_aufs" \ |
|
97 |
+ RUNC_BUILDTAGS="seccomp" \ |
|
98 |
+ hack/dockerfile/install/install.sh $component |
|
99 |
+done |
|
100 |
+VERSION=%{version} DOCKER_GITCOMMIT=${GIT_COMMIT_SHORT} hack/make.sh dynbinary |
|
115 | 101 |
popd |
116 | 102 |
|
117 | 103 |
%install |
... | ... |
@@ -121,12 +95,12 @@ install -d -m755 %{buildroot}%{_mandir}/man5 |
121 | 121 |
install -d -m755 %{buildroot}%{_mandir}/man8 |
122 | 122 |
install -d -m755 %{buildroot}%{_bindir} |
123 | 123 |
install -d -m755 %{buildroot}%{_unitdir} |
124 |
-install -d -m755 %{buildroot}lib/udev/rules.d |
|
124 |
+install -d -m755 %{buildroot}/lib/udev/rules.d |
|
125 | 125 |
install -d -m755 %{buildroot}%{_datadir}/bash-completion/completions |
126 | 126 |
|
127 | 127 |
# install binary |
128 |
-install -p -m 755 cli/build/docker %{buildroot}%{_bindir}/docker |
|
129 |
-install -p -m 755 "$(readlink -f engine/bundles/latest/dynbinary-daemon/dockerd)" %{buildroot}%{_bindir}/dockerd |
|
128 |
+install -p -m 755 "$(readlink -f components/cli/build/docker)" %{buildroot}%{_bindir}/docker |
|
129 |
+install -p -m 755 "$(readlink -f components/engine/bundles/latest/dynbinary-daemon/dockerd)" %{buildroot}%{_bindir}/dockerd |
|
130 | 130 |
|
131 | 131 |
# install proxy |
132 | 132 |
install -p -m 755 /usr/local/bin/docker-proxy %{buildroot}%{_bindir}/docker-proxy |
... | ... |
@@ -143,33 +117,33 @@ install -p -m 755 /usr/local/bin/docker-runc %{buildroot}%{_bindir}/docker-runc |
143 | 143 |
install -p -m 755 /usr/local/bin/docker-init %{buildroot}%{_bindir}/docker-init |
144 | 144 |
|
145 | 145 |
# install udev rules |
146 |
-install -p -m 644 engine/contrib/udev/80-docker.rules %{buildroot}lib/udev/rules.d/80-docker.rules |
|
146 |
+install -p -m 644 components/engine/contrib/udev/80-docker.rules %{buildroot}/lib/udev/rules.d/80-docker.rules |
|
147 | 147 |
|
148 | 148 |
# add init scripts |
149 |
-install -p -m 644 packaging/rpm/systemd/docker.service %{buildroot}%{_unitdir}/docker.service |
|
149 |
+install -p -m 644 components/packaging/rpm/systemd/docker.service %{buildroot}%{_unitdir}/docker.service |
|
150 | 150 |
|
151 |
-# add bash, zsh, and fish completions |
|
152 |
-install -p -m 644 engine/contrib/completion/bash/docker %{buildroot}%{_datadir}/bash-completion/completions/docker |
|
151 |
+# add bash completions |
|
152 |
+install -p -m 644 components/cli/contrib/completion/bash/docker %{buildroot}%{_datadir}/bash-completion/completions/docker |
|
153 | 153 |
|
154 | 154 |
# install manpages |
155 |
-install -p -m 644 cli/man/man1/*.1 %{buildroot}%{_mandir}/man1 |
|
156 |
-install -p -m 644 cli/man/man5/*.5 %{buildroot}%{_mandir}/man5 |
|
157 |
-install -p -m 644 cli/man/man8/*.8 %{buildroot}%{_mandir}/man8 |
|
155 |
+install -p -m 644 components/cli/man/man1/*.1 %{buildroot}%{_mandir}/man1 |
|
156 |
+install -p -m 644 components/cli/man/man5/*.5 %{buildroot}%{_mandir}/man5 |
|
157 |
+install -p -m 644 components/cli/man/man8/*.8 %{buildroot}%{_mandir}/man8 |
|
158 | 158 |
|
159 | 159 |
# add vimfiles |
160 | 160 |
install -d -m 755 %{buildroot}%{_datadir}/vim/vimfiles/doc |
161 | 161 |
install -d -m 755 %{buildroot}%{_datadir}/vim/vimfiles/ftdetect |
162 | 162 |
install -d -m 755 %{buildroot}%{_datadir}/vim/vimfiles/syntax |
163 |
-install -p -m 644 engine/contrib/syntax/vim/doc/dockerfile.txt %{buildroot}%{_datadir}/vim/vimfiles/doc/dockerfile.txt |
|
164 |
-install -p -m 644 engine/contrib/syntax/vim/ftdetect/dockerfile.vim %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/dockerfile.vim |
|
165 |
-install -p -m 644 engine/contrib/syntax/vim/syntax/dockerfile.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/dockerfile.vim |
|
163 |
+install -p -m 644 components/engine/contrib/syntax/vim/doc/dockerfile.txt %{buildroot}%{_datadir}/vim/vimfiles/doc/dockerfile.txt |
|
164 |
+install -p -m 644 components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/dockerfile.vim |
|
165 |
+install -p -m 644 components/engine/contrib/syntax/vim/syntax/dockerfile.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/dockerfile.vim |
|
166 | 166 |
|
167 | 167 |
mkdir -p build-docs |
168 | 168 |
for engine_file in AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md; do |
169 |
- cp "engine/$engine_file" "build-docs/engine-$engine_file" |
|
169 |
+ cp "components/engine/$engine_file" "build-docs/engine-$engine_file" |
|
170 | 170 |
done |
171 | 171 |
for cli_file in LICENSE MAINTAINERS NOTICE README.md; do |
172 |
- cp "cli/$cli_file" "build-docs/cli-$cli_file" |
|
172 |
+ cp "components/cli/$cli_file" "build-docs/cli-$cli_file" |
|
173 | 173 |
done |
174 | 174 |
|
175 | 175 |
install -v -D -m 0644 %{SOURCE6} %{buildroot}%{_presetdir}/50-docker.preset |
... | ... |
@@ -206,6 +180,7 @@ rm -rf %{buildroot}/* |
206 | 206 |
%{_bindir}/docker-runc |
207 | 207 |
%{_bindir}/docker-init |
208 | 208 |
%{_datadir}/bash-completion/completions/docker |
209 |
+/lib/udev/rules.d/80-docker.rules |
|
209 | 210 |
|
210 | 211 |
%files doc |
211 | 212 |
%defattr(-,root,root) |
... | ... |
@@ -220,6 +195,8 @@ rm -rf %{buildroot}/* |
220 | 220 |
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim |
221 | 221 |
|
222 | 222 |
%changelog |
223 |
+* Mon Apr 09 2018 Bo Gan <ganb@vmware.com> 18.03.0-1 |
|
224 |
+- Update to 18.03.0-ce |
|
223 | 225 |
* Fri Sep 22 2017 Bo Gan <ganb@vmware.com> 17.06.0-4 |
224 | 226 |
- disable docker service by default |
225 | 227 |
* Fri Sep 08 2017 Bo Gan <ganb@vmware.com> 17.06.0-3 |