Skip to content

Commit ac30efa

Browse files
committed
static: skip packaging if platform not supported
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
1 parent bbb3433 commit ac30efa

File tree

1 file changed

+68
-70
lines changed

1 file changed

+68
-70
lines changed

static/build-static

Lines changed: 68 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -170,79 +170,77 @@ esac
170170

171171
# docker CLI
172172
mkdir -p "${dockerCLIBuildDir}"
173-
case ${TARGETOS} in
174-
linux | darwin)
175-
cp "${CLI_DIR}"/build/"${targetPair}"/docker-"${TARGETOS}"-* "${dockerCLIBuildDir}/docker"
176-
;;
177-
windows)
178-
cp "${CLI_DIR}"/build/"${targetPair}"/docker-"${TARGETOS}"-*.exe "${dockerCLIBuildDir}/docker.exe"
179-
;;
180-
esac
181-
# package docker CLI
182-
case ${TARGETOS} in
183-
linux | darwin)
184-
(
185-
set -x
186-
tar -C "${buildDir}" -c -z -f "${buildDir}/docker-cli-${GEN_STATIC_VER}.tgz" docker-cli
187-
)
188-
;;
189-
windows)
190-
(
191-
cd "${buildDir}"
192-
set -x
193-
zip -r "docker-cli-${GEN_STATIC_VER}.zip" docker-cli
194-
)
195-
;;
196-
esac
173+
if [ -d "${CLI_DIR}/build" ]; then
174+
case ${TARGETOS} in
175+
linux | darwin)
176+
cp "${CLI_DIR}"/build/"${targetPair}"/docker-"${TARGETOS}"-* "${dockerCLIBuildDir}/docker"
177+
;;
178+
windows)
179+
cp "${CLI_DIR}"/build/"${targetPair}"/docker-"${TARGETOS}"-*.exe "${dockerCLIBuildDir}/docker.exe"
180+
;;
181+
esac
182+
# package docker CLI
183+
case ${TARGETOS} in
184+
linux | darwin)
185+
(
186+
set -x
187+
tar -C "${buildDir}" -c -z -f "${buildDir}/docker-cli-${GEN_STATIC_VER}.tgz" docker-cli
188+
)
189+
;;
190+
windows)
191+
(
192+
cd "${buildDir}"
193+
set -x
194+
zip -r "docker-cli-${GEN_STATIC_VER}.zip" docker-cli
195+
)
196+
;;
197+
esac
198+
fi
197199

198200
# docker, containerd, and runc
199201
mkdir -p "${dockerEngineBuildDir}"
200-
case ${TARGETOS} in
201-
linux)
202-
for f in dockerd docker-init docker-proxy; do
203-
if [ -f "${ENGINE_DIR}/build/${targetPair}/$f" ]; then
204-
cp -L "${ENGINE_DIR}/build/${targetPair}/$f" "${dockerEngineBuildDir}/$f"
205-
fi
206-
done
207-
# TODO containerd binaries should be built as part of containerd-packaging, not as part of docker/docker-ce-packaging
208-
mkdir -p "${containerdBuildDir}"
209-
for f in containerd ctr containerd-shim containerd-shim-runc-v2 runc; do
210-
if [ -f "${ENGINE_DIR}/build/${targetPair}/$f" ]; then
211-
cp -L "${ENGINE_DIR}/build/${targetPair}/$f" "${containerdBuildDir}/$f"
212-
fi
213-
done
214-
;;
215-
windows)
216-
for f in dockerd.exe docker-proxy.exe; do
217-
if [ -f "${ENGINE_DIR}/build/${targetPair}/$f" ]; then
218-
cp -L "${ENGINE_DIR}/build/${targetPair}/$f" "${dockerEngineBuildDir}/$f"
219-
fi
220-
done
221-
;;
222-
esac
223-
# package docker, containerd, and runc
224-
case ${TARGETOS} in
225-
darwin)
226-
(
227-
set -x
228-
tar -C "${buildDir}" -c -z -f "${buildDir}/docker-engine-${GEN_STATIC_VER}.tgz" docker-engine
229-
)
230-
;;
231-
linux)
232-
(
233-
set -x
234-
tar -C "${buildDir}" -c -z -f "${buildDir}/docker-engine-${GEN_STATIC_VER}.tgz" docker-engine
235-
tar -C "${buildDir}" -c -z -f "${buildDir}/containerd-${CONTAINERD_VERSION#v}.tgz" containerd
236-
)
237-
;;
238-
windows)
239-
(
240-
cd "${buildDir}"
241-
set -x
242-
zip -r "docker-engine-${GEN_STATIC_VER}.zip" docker-engine
243-
)
244-
;;
245-
esac
202+
if [ -d "${ENGINE_DIR}/build" ]; then
203+
case ${TARGETOS} in
204+
linux)
205+
for f in dockerd docker-init docker-proxy; do
206+
if [ -f "${ENGINE_DIR}/build/${targetPair}/$f" ]; then
207+
cp -L "${ENGINE_DIR}/build/${targetPair}/$f" "${dockerEngineBuildDir}/$f"
208+
fi
209+
done
210+
# TODO containerd binaries should be built as part of containerd-packaging, not as part of docker/docker-ce-packaging
211+
mkdir -p "${containerdBuildDir}"
212+
for f in containerd ctr containerd-shim containerd-shim-runc-v2 runc; do
213+
if [ -f "${ENGINE_DIR}/build/${targetPair}/$f" ]; then
214+
cp -L "${ENGINE_DIR}/build/${targetPair}/$f" "${containerdBuildDir}/$f"
215+
fi
216+
done
217+
;;
218+
windows)
219+
for f in dockerd.exe docker-proxy.exe; do
220+
if [ -f "${ENGINE_DIR}/build/${targetPair}/$f" ]; then
221+
cp -L "${ENGINE_DIR}/build/${targetPair}/$f" "${dockerEngineBuildDir}/$f"
222+
fi
223+
done
224+
;;
225+
esac
226+
# package docker, containerd, and runc
227+
case ${TARGETOS} in
228+
linux)
229+
(
230+
set -x
231+
tar -C "${buildDir}" -c -z -f "${buildDir}/docker-engine-${GEN_STATIC_VER}.tgz" docker-engine
232+
tar -C "${buildDir}" -c -z -f "${buildDir}/containerd-${CONTAINERD_VERSION#v}.tgz" containerd
233+
)
234+
;;
235+
windows)
236+
(
237+
cd "${buildDir}"
238+
set -x
239+
zip -r "docker-engine-${GEN_STATIC_VER}.zip" docker-engine
240+
)
241+
;;
242+
esac
243+
fi
246244

247245
# docker CLI + docker engine
248246
# TODO: for backward compat keep a copy of the old docker.tgz for now

0 commit comments

Comments
 (0)