diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 90e3b53..93d6594 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -29,10 +29,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Install Podman & Tools + - name: Install Tools run: | sudo apt-get update - sudo apt-get install -y podman jq curl + sudo apt-get install -y jq curl - name: Prepare environment run: | @@ -71,11 +71,8 @@ jobs: sep-annotations: " " - name: Build Image - env: - STORAGE_DRIVER: vfs - CONTAINERS_CONF: "" run: | - podman --storage-driver=vfs build \ + docker build \ -f ./Containerfile \ -t "localhost/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}" \ --label "org.opencontainers.image.title=${{ env.IMAGE_NAME }}" \ @@ -85,7 +82,6 @@ jobs: --label "ostree.bootable=1" \ . - - name: Rechunk with chunkah run: | set -euo pipefail @@ -93,12 +89,12 @@ jobs: IMG="localhost/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}" CHUNKED_IMG="localhost/${{ env.IMAGE_NAME }}-chunked:${{ env.IMAGE_TAG }}" - CONFIG=$(podman inspect "$IMG" | jq -c .[0]) + CONFIG=$(docker 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" - podman build --skip-unused-stages=false \ + docker build --skip-unused-stages=false \ -f "$CHUNKAH_CF" \ --from "$IMG" \ --build-arg CHUNKAH_CONFIG_STR="$CONFIG" \ @@ -107,17 +103,17 @@ jobs: . rm -f "$CHUNKAH_CF" - podman rmi "$IMG" + docker rmi "$IMG" for full_tag in ${{ steps.metadata.outputs.tags }}; do tag_only="${full_tag##*:}" - podman tag "$CHUNKED_IMG" "localhost/${{ env.IMAGE_NAME }}:${tag_only}" + docker tag "$CHUNKED_IMG" "localhost/${{ env.IMAGE_NAME }}:${tag_only}" done - podman rmi "$CHUNKED_IMG" + docker rmi "$CHUNKED_IMG" - name: Login to Gitea Container Registry run: | - podman login -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}" humocs-man.duckdns.org + docker login -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}" humocs-man.duckdns.org - name: Push to Gitea Registry run: | @@ -126,11 +122,11 @@ jobs: LOCAL_TAG="localhost/${{ env.IMAGE_NAME }}:${tag_only}" REMOTE_TAG="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${tag_only}" - podman tag "$LOCAL_TAG" "$REMOTE_TAG" - podman push "$REMOTE_TAG" + docker tag "$LOCAL_TAG" "$REMOTE_TAG" + docker push "$REMOTE_TAG" done - DIGEST=$(podman inspect "${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}" | jq -r '.[0].Digest') + DIGEST=$(docker inspect "${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}" | jq -r '.[0].Digest') echo "IMAGE_DIGEST=$DIGEST" >> $GITHUB_ENV - name: Install Cosign