From fc722fe8f8fd0360e54ed3ada640ad333b53e770 Mon Sep 17 00:00:00 2001 From: gunnar Date: Fri, 5 Jun 2026 20:15:48 +0200 Subject: [PATCH] back to podman but privileged --- .gitea/workflows/build.yml | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 00d103d..e7d1664 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -29,10 +29,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Install Tools + - name: Install Podman & Tools run: | sudo apt-get update - sudo apt-get install -y jq curl + sudo apt-get install -y podman jq curl - name: Prepare environment run: | @@ -72,14 +72,13 @@ jobs: - name: Build Image run: | - docker build \ + # Labels für Podman vorbereiten + BUILDAH_LABELS=$(echo "${{ steps.metadata.outputs.labels }}" | sed 's/^/--label /') + + podman build \ -f ./Containerfile \ -t "localhost/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}" \ - --label "org.opencontainers.image.title=${{ env.IMAGE_NAME }}" \ - --label "org.opencontainers.image.description=${{ env.IMAGE_DESC }}" \ - --label "org.opencontainers.image.vendor=${{ github.repository_owner }}" \ - --label "containers.bootc=1" \ - --label "ostree.bootable=1" \ + $BUILDAH_LABELS \ . - name: Rechunk with chunkah @@ -89,13 +88,12 @@ jobs: IMG="localhost/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}" CHUNKED_IMG="localhost/${{ env.IMAGE_NAME }}-chunked:${{ env.IMAGE_TAG }}" - CONFIG=$(docker inspect "$IMG" | jq -c .[0]) + CONFIG=$(podman inspect "$IMG" | jq -c .[0]) CHUNKAH_CF=$(mktemp) curl -sL https://github.com/coreos/chunkah/releases/download/v0.5.0/Containerfile.splitter -o "$CHUNKAH_CF" - # Hier wurde '--skip-unused-stages=false' entfernt - docker build \ + podman build --skip-unused-stages=false \ -f "$CHUNKAH_CF" \ --from "$IMG" \ --build-arg CHUNKAH_CONFIG_STR="$CONFIG" \ @@ -104,17 +102,17 @@ jobs: . rm -f "$CHUNKAH_CF" - docker rmi "$IMG" + podman rmi "$IMG" for full_tag in ${{ steps.metadata.outputs.tags }}; do tag_only="${full_tag##*:}" - docker tag "$CHUNKED_IMG" "localhost/${{ env.IMAGE_NAME }}:${tag_only}" + podman tag "$CHUNKED_IMG" "localhost/${{ env.IMAGE_NAME }}:${tag_only}" done - docker rmi "$CHUNKED_IMG" + podman rmi "$CHUNKED_IMG" - name: Login to Gitea Container Registry run: | - docker login -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}" humocs-man.duckdns.org + podman login -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}" humocs-man.duckdns.org - name: Push to Gitea Registry run: | @@ -123,11 +121,11 @@ jobs: LOCAL_TAG="localhost/${{ env.IMAGE_NAME }}:${tag_only}" REMOTE_TAG="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${tag_only}" - docker tag "$LOCAL_TAG" "$REMOTE_TAG" - docker push "$REMOTE_TAG" + podman tag "$LOCAL_TAG" "$REMOTE_TAG" + podman push "$REMOTE_TAG" done - DIGEST=$(docker inspect "${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}" | jq -r '.[0].Digest') + DIGEST=$(podman inspect "${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}" | jq -r '.[0].Digest') echo "IMAGE_DIGEST=$DIGEST" >> $GITHUB_ENV - name: Install Cosign