Commit 85c0265e authored by Ruben ten Hove's avatar Ruben ten Hove
Browse files

Merge branch 'rhtenhove-main-patch-29319' into 'main' 

fix: buildah isolation

See merge request just-ci/templates!163
parents d1673a59 702f5e06

container/buildah.yml

+3 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ include: 
  - local: container/image.yml



variables:

  BUILDAH_DEFAULT_ARGS: --isolation=chroot

  BUILDAH_EXTRA_ARGS: "" # https://github.com/containers/buildah/blob/main/docs/buildah-build.1.md



.buildah:
@@ -22,7 +23,8 @@ variables: 
    - buildah --version

    - buildah build --authfile /tmp/auth.json -f ${IMAGE_CONTAINERFILE}

      --tag=${IMAGE_NAME}:${IMAGE_DEV_TAG} --tag=${IMAGE_NAME}:${IMAGE_TAG}

      --layers=${IMAGE_CACHE} ${BUILDAH_EXTRA_ARGS} ${IMAGE_CONTEXT}

      --layers=${IMAGE_CACHE} ${BUILDAH_DEFAULT_ARGS} ${BUILDAH_EXTRA_ARGS}

      ${IMAGE_CONTEXT}

    - |

      for IMAGE in "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:${IMAGE_DEV_TAG}"; do

        buildah push --authfile /tmp/auth.json ${IMAGE}