Skip to content

Commit e691eec

Browse files
babykartedannenberg
authored andcommitted
Add Podman engine #160
1 parent 4427aea commit e691eec

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

engine/docker.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ _portage_image_processed='false'
3131
# Is this engine functional? Called once per engine in current image dependency graph.
3232
function validate_engine() {
3333
local docker_version
34-
_required_binaries+=" docker"
34+
_required_binaries+=" ${DOCKER}"
3535
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}"
3737
}
3838

3939
# 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() {
240240
|| { msg_error "${_status_msg}"; die; }
241241
fi
242242

243-
_status_msg="exec docker build -t ${image_id}:${IMAGE_TAG}"
243+
_status_msg="exec ${DOCKER} build -t ${image_id}:${IMAGE_TAG}"
244244
# shellcheck disable=SC2086
245245
pwrap "${DOCKER}" build ${DOCKER_BUILD_OPTS} -t "${image_id}:${IMAGE_TAG}" "${image_path}" || die "${_status_msg}"
246246

247247
_status_msg="tag image ${image_id}:latest"
248248
pwrap 'nolog' "${DOCKER}" tag "${image_id}:${IMAGE_TAG}" "${image_id}:latest" || die "${_status_msg}"
249249

250+
local prune_args
251+
prune_args=()
252+
[[ "${DOCKER}" == 'docker' ]] && prune_args+=( '-f' )
253+
250254
[[ "${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[@]}"
252256

253257
[[ "${KUBLER_POSTBUILD_VOLUME_PRUNE}" == 'true' ]] \
254258
&& _status_msg="remove unused volumes" && pwrap "${DOCKER}" volume prune -f

engine/podman.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
# Copyright (c) 2014-2019, Erik Dannenberg <erik.dannenberg@xtrade-gmbh.de>
3+
# All rights reserved.
4+
5+
PODMAN="${PODMAN:-podman}"
6+
PODMAN_BUILD_OPTS="${PODMAN_BUILD_OPTS:---format docker}"
7+
DOCKER="${PODMAN}"
8+
DOCKER_BUILD_OPTS="${PODMAN_BUILD_OPTS}"
9+
10+
source "${_KUBLER_DIR}/engine/docker.sh"

0 commit comments

Comments
 (0)