From d4bd333b4f0d969ea4b3170ce38fe437778dc3d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Wed, 20 Sep 2023 13:13:25 +0200 Subject: [PATCH] Produce docker format containers by default podman, unlike docker, defaults to oci. Allow setting that as well but default to be docker compatible with allowing the docker extensions. --- build-recipe-docker | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build-recipe-docker b/build-recipe-docker index 2d0e19634..c3b3ae923 100644 --- a/build-recipe-docker +++ b/build-recipe-docker @@ -250,7 +250,12 @@ recipe_build_docker() { if test "$BUILDENGINE" = podman; then test -n "$squashopt" && squashopt="--layers=false" - if ! $DOCKER_CMD build $squashopt -v "$TOPDIR/SOURCES/repos:$TOPDIR/SOURCES/repos" --network=host "${tagargs[@]}" "${buildargs[@]}" -f "$TOPDIR/SOURCES/$RECIPEFILE" $TOPDIR/SOURCES/ ; then + buildformat=$(queryconfig --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH" buildflags+ buildformat) + formatopt="--format docker" + if test -n "$buildformat" -a "$buildformat" = "oci"; then + formatopt="--format oci" + fi + if ! $DOCKER_CMD build $formatopt $squashopt -v "$TOPDIR/SOURCES/repos:$TOPDIR/SOURCES/repos" --network=host "${tagargs[@]}" "${buildargs[@]}" -f "$TOPDIR/SOURCES/$RECIPEFILE" $TOPDIR/SOURCES/ ; then cleanup_and_exit 1 "$DOCKER_TOOL build command failed" fi else