From 26362ea7b931c95f35ea88e18a2665808cf6b4c6 Mon Sep 17 00:00:00 2001 From: Jeffrey Serio <23226432+hyperreal64@users.noreply.github.com> Date: Wed, 6 Mar 2024 11:41:32 -0600 Subject: [PATCH] Check status of container --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cbd02cd..9dbca86 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,6 @@ compose-job: BUILD_REPO: "/build-repo" SOURCE_REPO: "/source-repo" before_script: - - podman image prune -f - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY" script: - mkdir -p "$(pwd)/.tmp" @@ -37,7 +36,7 @@ nonfree-build-job: - buildah-exec image: git.hyperreal.coffee:5050/fedora-atomic/containers/buildah:latest variables: - STORAGE_DRIVER: overlay2 + STORAGE_DRIVER: overlay BUILDAH_FORMAT: docker BUILDAH_ISOLATION: chroot FQ_IMAGE_NAME: "$CI_REGISTRY_IMAGE/vauxite-nonfree:39" @@ -46,8 +45,10 @@ nonfree-build-job: - buildah login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY" script: - container=$(buildah from git.hyperreal.coffee:5050/fedora-atomic/vauxite-build/vauxite:39) + - buildah containers - buildah run $container -- rpm-ostree install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-39.noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-39.noarch.rpm - buildah run $container -- rpm-ostree override remove libavcodec-free libavfilter-free libavformat-free libavutil-free libpostproc-free libswresample-free libswscale-free --install ffmpeg-libs - buildah run $container -- ostree container commit + - buildah containers - buildah commit --squash --rm $container "$FQ_IMAGE_NAME" - buildah push "$FQ_IMAGE_NAME"