@@ -31,9 +31,9 @@ _portage_image_processed='false'
31
31
# Is this engine functional? Called once per engine in current image dependency graph.
32
32
function validate_engine() {
33
33
local docker_version
34
- _required_binaries+=" docker "
34
+ _required_binaries+=" ${DOCKER} "
35
35
has_required_binaries
36
- docker_version=$( ${DOCKER} " version" ) || die " Failed to query the docker daemon :\\ n${docker_version} "
36
+ docker_version=$( ${DOCKER} " version" ) || die " Failed to query ${DOCKER} :\\ n${docker_version} "
37
37
}
38
38
39
39
# Has given image_id all requirements to start the build? Called once per image in current image dependency graph.
@@ -240,15 +240,19 @@ function build_image() {
240
240
|| { msg_error " ${_status_msg} " ; die; }
241
241
fi
242
242
243
- _status_msg=" exec docker build -t ${image_id} :${IMAGE_TAG} "
243
+ _status_msg=" exec ${DOCKER} build -t ${image_id} :${IMAGE_TAG} "
244
244
# shellcheck disable=SC2086
245
245
pwrap " ${DOCKER} " build ${DOCKER_BUILD_OPTS} -t " ${image_id} :${IMAGE_TAG} " " ${image_path} " || die " ${_status_msg} "
246
246
247
247
_status_msg=" tag image ${image_id} :latest"
248
248
pwrap ' nolog' " ${DOCKER} " tag " ${image_id} :${IMAGE_TAG} " " ${image_id} :latest" || die " ${_status_msg} "
249
249
250
+ local prune_args
251
+ prune_args=()
252
+ [[ " ${DOCKER} " == ' docker' ]] && prune_args+=( ' -f' )
253
+
250
254
[[ " ${KUBLER_POSTBUILD_IMAGE_PRUNE} " == ' true' ]] \
251
- && _status_msg=" remove untagged images" && pwrap " ${DOCKER} " image prune -f
255
+ && _status_msg=" remove untagged images" && pwrap " ${DOCKER} " image prune " ${prune_args[@]} "
252
256
253
257
[[ " ${KUBLER_POSTBUILD_VOLUME_PRUNE} " == ' true' ]] \
254
258
&& _status_msg=" remove unused volumes" && pwrap " ${DOCKER} " volume prune -f
0 commit comments