This reverts commit 1493fad760c6044ac5991230f405cfdfb49e9eaf.
Change-Id: I8df5ce5b79a5ffb2ea910fc9df5aa3ffd623fb6b
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5018
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>
... | ... |
@@ -3,16 +3,28 @@ |
3 | 3 |
%define __os_install_post %{nil} |
4 | 4 |
Summary: Docker |
5 | 5 |
Name: docker |
6 |
-Version: 18.03.0 |
|
7 |
-Release: 1%{?dist} |
|
6 |
+Version: 17.06.0 |
|
7 |
+Release: 4%{?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 |
-Source0: https://github.com/docker/docker-ce/archive/docker-%{version}-ce.tar.gz |
|
14 |
-%define sha1 docker=873472d4b722aaf0e000ba0d0b1fa3d63d276ffc |
|
15 |
-%define DOCKER_GITCOMMIT 0520e243029d1361649afb0706a1c5d9a1c012b8 |
|
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 |
|
16 | 28 |
Source6: default-disable.preset |
17 | 29 |
Patch0: remove-firewalld.patch |
18 | 30 |
|
... | ... |
@@ -50,42 +62,56 @@ Documentation and vimfiles for docker |
50 | 50 |
|
51 | 51 |
%prep |
52 | 52 |
%setup -q -c |
53 |
+%setup -T -D -a 1 |
|
54 |
+%setup -T -D -a 2 |
|
55 |
+%setup -T -D -a 3 |
|
56 |
+%setup -T -D -a 4 |
|
57 |
+%setup -T -D -a 5 |
|
53 | 58 |
|
54 |
-#ln -s docker-ce/components/cli cli |
|
55 |
-#ln -s docker-ce/components/engine engine |
|
56 |
-#ln -s docker-ce/components/packaging packaging |
|
59 |
+ln -s docker-ce/components/cli cli |
|
60 |
+ln -s docker-ce/components/engine engine |
|
61 |
+ln -s docker-ce/components/packaging packaging |
|
57 | 62 |
|
58 |
-%patch0 -p1 |
|
63 |
+%patch0 -p2 |
|
59 | 64 |
|
60 | 65 |
mkdir -p /go/src/github.com |
61 | 66 |
cd /go/src/github.com |
62 | 67 |
mkdir opencontainers |
68 |
+mkdir containerd |
|
69 |
+mkdir cpuguy83 |
|
63 | 70 |
mkdir docker |
64 | 71 |
|
65 |
-ln -snrf "$OLDPWD/components/engine" docker/docker |
|
66 |
-ln -snrf "$OLDPWD/components/cli" docker/cli |
|
72 |
+ln -snrf "$OLDPWD/containerd" containerd/ |
|
73 |
+ln -snrf "$OLDPWD/engine" docker/docker |
|
74 |
+ln -snrf "$OLDPWD/runc" opencontainers/ |
|
75 |
+ln -snrf "$OLDPWD/go-md2man" cpuguy83/ |
|
76 |
+ln -snrf "$OLDPWD/libnetwork" docker/ |
|
77 |
+ln -snrf "$OLDPWD/cli" docker/ |
|
78 |
+ |
|
79 |
+ln -snrf "$OLDPWD/tini" /go/ |
|
80 |
+ |
|
81 |
+sed -i '/^\s*git clone.*$/d' docker/docker/hack/dockerfile/install-binaries.sh |
|
82 |
+ |
|
83 |
+#catch git clone |
|
84 |
+git config --global http.proxy http://localhost:0 |
|
67 | 85 |
|
68 | 86 |
%build |
69 | 87 |
|
70 | 88 |
export GOPATH="/go" |
71 | 89 |
export PATH="$PATH:$GOPATH/bin" |
72 | 90 |
|
73 |
-GIT_COMMIT=%{DOCKER_GITCOMMIT} |
|
74 |
-GIT_COMMIT_SHORT=${GIT_COMMIT:0:7} |
|
91 |
+export DOCKER_BUILDTAGS="pkcs11 seccomp exclude_graphdriver_aufs" |
|
92 |
+export RUNC_BUILDTAGS="seccomp" |
|
75 | 93 |
|
76 |
-cd "$GOPATH/src/github.com/docker" |
|
94 |
+cd /go/src/github.com |
|
77 | 95 |
|
78 |
-pushd cli |
|
79 |
-DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=%{version} GITCOMMIT=${GIT_COMMIT_SHORT} dynbinary manpages |
|
96 |
+pushd docker/cli |
|
97 |
+make VERSION="$(cat VERSION)" dynbinary manpages |
|
80 | 98 |
popd |
81 | 99 |
|
82 |
-pushd docker |
|
83 |
-for component in tini "proxy dynamic" "runc all" "containerd dynamic"; do |
|
84 |
- DOCKER_BUILDTAGS="pkcs11 seccomp exclude_graphdriver_aufs" \ |
|
85 |
- RUNC_BUILDTAGS="seccomp" \ |
|
86 |
- hack/dockerfile/install/install.sh $component |
|
87 |
-done |
|
88 |
-VERSION=%{version} DOCKER_GITCOMMIT=${GIT_COMMIT_SHORT} hack/make.sh dynbinary |
|
100 |
+pushd docker/docker |
|
101 |
+TMP_GOPATH="$GOPATH" ./hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini |
|
102 |
+DOCKER_GITCOMMIT="$(git rev-parse --short HEAD)" ./hack/make.sh dynbinary |
|
89 | 103 |
popd |
90 | 104 |
|
91 | 105 |
%install |
... | ... |
@@ -95,12 +121,12 @@ install -d -m755 %{buildroot}%{_mandir}/man5 |
95 | 95 |
install -d -m755 %{buildroot}%{_mandir}/man8 |
96 | 96 |
install -d -m755 %{buildroot}%{_bindir} |
97 | 97 |
install -d -m755 %{buildroot}%{_unitdir} |
98 |
-install -d -m755 %{buildroot}/lib/udev/rules.d |
|
98 |
+install -d -m755 %{buildroot}lib/udev/rules.d |
|
99 | 99 |
install -d -m755 %{buildroot}%{_datadir}/bash-completion/completions |
100 | 100 |
|
101 | 101 |
# install binary |
102 |
-install -p -m 755 "$(readlink -f components/cli/build/docker)" %{buildroot}%{_bindir}/docker |
|
103 |
-install -p -m 755 "$(readlink -f components/engine/bundles/latest/dynbinary-daemon/dockerd)" %{buildroot}%{_bindir}/dockerd |
|
102 |
+install -p -m 755 cli/build/docker %{buildroot}%{_bindir}/docker |
|
103 |
+install -p -m 755 "$(readlink -f engine/bundles/latest/dynbinary-daemon/dockerd)" %{buildroot}%{_bindir}/dockerd |
|
104 | 104 |
|
105 | 105 |
# install proxy |
106 | 106 |
install -p -m 755 /usr/local/bin/docker-proxy %{buildroot}%{_bindir}/docker-proxy |
... | ... |
@@ -117,33 +143,33 @@ install -p -m 755 /usr/local/bin/docker-runc %{buildroot}%{_bindir}/docker-runc |
117 | 117 |
install -p -m 755 /usr/local/bin/docker-init %{buildroot}%{_bindir}/docker-init |
118 | 118 |
|
119 | 119 |
# install udev rules |
120 |
-install -p -m 644 components/engine/contrib/udev/80-docker.rules %{buildroot}/lib/udev/rules.d/80-docker.rules |
|
120 |
+install -p -m 644 engine/contrib/udev/80-docker.rules %{buildroot}lib/udev/rules.d/80-docker.rules |
|
121 | 121 |
|
122 | 122 |
# add init scripts |
123 |
-install -p -m 644 components/packaging/rpm/systemd/docker.service %{buildroot}%{_unitdir}/docker.service |
|
123 |
+install -p -m 644 packaging/rpm/systemd/docker.service %{buildroot}%{_unitdir}/docker.service |
|
124 | 124 |
|
125 |
-# add bash completions |
|
126 |
-install -p -m 644 components/cli/contrib/completion/bash/docker %{buildroot}%{_datadir}/bash-completion/completions/docker |
|
125 |
+# add bash, zsh, and fish completions |
|
126 |
+install -p -m 644 engine/contrib/completion/bash/docker %{buildroot}%{_datadir}/bash-completion/completions/docker |
|
127 | 127 |
|
128 | 128 |
# install manpages |
129 |
-install -p -m 644 components/cli/man/man1/*.1 %{buildroot}%{_mandir}/man1 |
|
130 |
-install -p -m 644 components/cli/man/man5/*.5 %{buildroot}%{_mandir}/man5 |
|
131 |
-install -p -m 644 components/cli/man/man8/*.8 %{buildroot}%{_mandir}/man8 |
|
129 |
+install -p -m 644 cli/man/man1/*.1 %{buildroot}%{_mandir}/man1 |
|
130 |
+install -p -m 644 cli/man/man5/*.5 %{buildroot}%{_mandir}/man5 |
|
131 |
+install -p -m 644 cli/man/man8/*.8 %{buildroot}%{_mandir}/man8 |
|
132 | 132 |
|
133 | 133 |
# add vimfiles |
134 | 134 |
install -d -m 755 %{buildroot}%{_datadir}/vim/vimfiles/doc |
135 | 135 |
install -d -m 755 %{buildroot}%{_datadir}/vim/vimfiles/ftdetect |
136 | 136 |
install -d -m 755 %{buildroot}%{_datadir}/vim/vimfiles/syntax |
137 |
-install -p -m 644 components/engine/contrib/syntax/vim/doc/dockerfile.txt %{buildroot}%{_datadir}/vim/vimfiles/doc/dockerfile.txt |
|
138 |
-install -p -m 644 components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/dockerfile.vim |
|
139 |
-install -p -m 644 components/engine/contrib/syntax/vim/syntax/dockerfile.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/dockerfile.vim |
|
137 |
+install -p -m 644 engine/contrib/syntax/vim/doc/dockerfile.txt %{buildroot}%{_datadir}/vim/vimfiles/doc/dockerfile.txt |
|
138 |
+install -p -m 644 engine/contrib/syntax/vim/ftdetect/dockerfile.vim %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/dockerfile.vim |
|
139 |
+install -p -m 644 engine/contrib/syntax/vim/syntax/dockerfile.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/dockerfile.vim |
|
140 | 140 |
|
141 | 141 |
mkdir -p build-docs |
142 | 142 |
for engine_file in AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md; do |
143 |
- cp "components/engine/$engine_file" "build-docs/engine-$engine_file" |
|
143 |
+ cp "engine/$engine_file" "build-docs/engine-$engine_file" |
|
144 | 144 |
done |
145 | 145 |
for cli_file in LICENSE MAINTAINERS NOTICE README.md; do |
146 |
- cp "components/cli/$cli_file" "build-docs/cli-$cli_file" |
|
146 |
+ cp "cli/$cli_file" "build-docs/cli-$cli_file" |
|
147 | 147 |
done |
148 | 148 |
|
149 | 149 |
install -v -D -m 0644 %{SOURCE6} %{buildroot}%{_presetdir}/50-docker.preset |
... | ... |
@@ -180,7 +206,6 @@ rm -rf %{buildroot}/* |
180 | 180 |
%{_bindir}/docker-runc |
181 | 181 |
%{_bindir}/docker-init |
182 | 182 |
%{_datadir}/bash-completion/completions/docker |
183 |
-/lib/udev/rules.d/80-docker.rules |
|
184 | 183 |
|
185 | 184 |
%files doc |
186 | 185 |
%defattr(-,root,root) |
... | ... |
@@ -195,8 +220,6 @@ rm -rf %{buildroot}/* |
195 | 195 |
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim |
196 | 196 |
|
197 | 197 |
%changelog |
198 |
-* Mon Apr 09 2018 Bo Gan <ganb@vmware.com> 18.03.0-1 |
|
199 |
-- Update to 18.03.0-ce |
|
200 | 198 |
* Fri Sep 22 2017 Bo Gan <ganb@vmware.com> 17.06.0-4 |
201 | 199 |
- disable docker service by default |
202 | 200 |
* Fri Sep 08 2017 Bo Gan <ganb@vmware.com> 17.06.0-3 |