Skip to content

Commit

Permalink
Support podman for building release images
Browse files Browse the repository at this point in the history
podman returns nozero exit code for `docker buildx`, because
it misses a subcommand.

`docker buildx version` should work both in podman and docker. Tested both
with docker-ce-20.10.18 + docker-buildx-plugin-0.10.2 and podman-4.5.0 +
podman-docker.
  • Loading branch information
jsafrane committed May 18, 2023
1 parent e1ad9be commit b2eae2f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion hack/lib/util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,8 @@ function kube::util::ensure-cfssl {
# Check if we have "docker buildx" commands available
#
function kube::util::ensure-docker-buildx {
if docker buildx >/dev/null 2>&1; then
# podman returns 0 on `docker buildx version`, docker on `docker buildx`. One of them must succeed.
if docker buildx version >/dev/null 2>&1 || docker buildx >/dev/null 2>&1; then
return 0
else
echo "ERROR: docker buildx not available. Docker 19.03 or higher is required with experimental features enabled"
Expand Down

0 comments on commit b2eae2f

Please sign in to comment.