137
137
buildDir=" ${CURDIR} /build/${TARGETPLATFORM} "
138
138
139
139
dockerCLIBuildDir=" ${buildDir} /docker-cli"
140
- dockerBuildDir=" ${buildDir} /docker-engine"
140
+ dockerEngineBuildDir=" ${buildDir} /docker-engine"
141
+ dockerBuildDir=" ${buildDir} /docker"
141
142
containerdBuildDir=" ${buildDir} /containerd"
142
143
rootlessExtrasBuildDir=" ${buildDir} /docker-rootless-extras"
143
144
buildxBuildDir=" ${buildDir} /docker-buildx"
@@ -195,12 +196,12 @@ case ${TARGETOS} in
195
196
esac
196
197
197
198
# docker, containerd, and runc
198
- mkdir -p " ${dockerBuildDir } "
199
+ mkdir -p " ${dockerEngineBuildDir } "
199
200
case ${TARGETOS} in
200
201
linux)
201
202
for f in dockerd docker-init docker-proxy; do
202
203
if [ -f " ${ENGINE_DIR} /build/${targetPair} /$f " ]; then
203
- cp -L " ${ENGINE_DIR} /build/${targetPair} /$f " " ${dockerBuildDir } /$f "
204
+ cp -L " ${ENGINE_DIR} /build/${targetPair} /$f " " ${dockerEngineBuildDir } /$f "
204
205
fi
205
206
done
206
207
# TODO containerd binaries should be built as part of containerd-packaging, not as part of docker/docker-ce-packaging
@@ -214,7 +215,7 @@ case ${TARGETOS} in
214
215
windows)
215
216
for f in dockerd.exe docker-proxy.exe; do
216
217
if [ -f " ${ENGINE_DIR} /build/${targetPair} /$f " ]; then
217
- cp -L " ${ENGINE_DIR} /build/${targetPair} /$f " " ${dockerBuildDir } /$f "
218
+ cp -L " ${ENGINE_DIR} /build/${targetPair} /$f " " ${dockerEngineBuildDir } /$f "
218
219
fi
219
220
done
220
221
;;
@@ -243,6 +244,32 @@ case ${TARGETOS} in
243
244
;;
244
245
esac
245
246
247
+ # docker CLI + docker engine
248
+ # TODO: for backward compat keep a copy of the old docker.tgz for now
249
+ mkdir -p " ${dockerBuildDir} "
250
+ if [ -d " ${dockerCLIBuildDir} " ]; then
251
+ cp " ${dockerCLIBuildDir} " /* " ${dockerBuildDir} /"
252
+ fi
253
+ if [ -d " ${dockerEngineBuildDir} " ]; then
254
+ cp " ${dockerEngineBuildDir} " /* " ${dockerBuildDir} /"
255
+ fi
256
+ # package docker
257
+ case ${TARGETOS} in
258
+ linux | darwin)
259
+ (
260
+ set -x
261
+ tar -C " ${buildDir} " -c -z -f " ${buildDir} /docker-${GEN_STATIC_VER} .tgz" docker
262
+ )
263
+ ;;
264
+ windows)
265
+ (
266
+ cd " ${buildDir} "
267
+ set -x
268
+ zip -r " docker-${GEN_STATIC_VER} .zip" docker
269
+ )
270
+ ;;
271
+ esac
272
+
246
273
# rootless extras
247
274
case ${TARGETOS} in
248
275
linux)
0 commit comments