Skip to content

Commit 938f246

Browse files
Allow skipping image builds when the binaries are already created
Makes it slightly easier to build images on Mac, will update in the future with a cleaner construct.
1 parent 76beec4 commit 938f246

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

Diff for: hack/build-images.sh

+13-11
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,19 @@ if [[ "${OS_RELEASE:-}" == "n" ]]; then
1515
imagedir="${OS_OUTPUT_BINPATH}/linux/amd64"
1616
# identical to build-cross.sh
1717
os::build::os_version_vars
18-
OS_RELEASE_COMMIT="${OS_GIT_VERSION//+/-}"
19-
platform="$(os::build::host_platform)"
20-
OS_BUILD_PLATFORMS=("${OS_IMAGE_COMPILE_PLATFORMS[@]:-${platform}}")
21-
OS_IMAGE_COMPILE_TARGETS=("${OS_IMAGE_COMPILE_TARGETS[@]:-${OS_IMAGE_COMPILE_TARGETS_LINUX[@]}}")
22-
OS_SCRATCH_IMAGE_COMPILE_TARGETS=("${OS_SCRATCH_IMAGE_COMPILE_TARGETS[@]:-${OS_SCRATCH_IMAGE_COMPILE_TARGETS_LINUX[@]}}")
23-
24-
echo "Building images from source ${OS_RELEASE_COMMIT}:"
25-
echo
26-
os::build::build_static_binaries "${OS_IMAGE_COMPILE_TARGETS[@]-}" "${OS_SCRATCH_IMAGE_COMPILE_TARGETS[@]-}"
27-
os::build::place_bins "${OS_IMAGE_COMPILE_BINARIES[@]}"
28-
echo
18+
if [[ -z "${OS_RELEASE_LOCAL}" ]]; then
19+
OS_RELEASE_COMMIT="${OS_GIT_VERSION//+/-}"
20+
platform="$(os::build::host_platform)"
21+
OS_BUILD_PLATFORMS=("${OS_IMAGE_COMPILE_PLATFORMS[@]:-${platform}}")
22+
OS_IMAGE_COMPILE_TARGETS=("${OS_IMAGE_COMPILE_TARGETS[@]:-${OS_IMAGE_COMPILE_TARGETS_LINUX[@]}}")
23+
OS_SCRATCH_IMAGE_COMPILE_TARGETS=("${OS_SCRATCH_IMAGE_COMPILE_TARGETS[@]:-${OS_SCRATCH_IMAGE_COMPILE_TARGETS_LINUX[@]}}")
24+
25+
echo "Building images from source ${OS_RELEASE_COMMIT}:"
26+
echo
27+
os::build::build_static_binaries "${OS_IMAGE_COMPILE_TARGETS[@]-}" "${OS_SCRATCH_IMAGE_COMPILE_TARGETS[@]-}"
28+
os::build::place_bins "${OS_IMAGE_COMPILE_BINARIES[@]}"
29+
echo
30+
fi
2931
else
3032
# Get the latest Linux release
3133
if [[ ! -d _output/local/releases ]]; then

0 commit comments

Comments
 (0)