diff --git a/.forgejo/workflows/build-image.yaml b/.forgejo/workflows/build-image.yaml index 954c8f5..df737ff 100644 --- a/.forgejo/workflows/build-image.yaml +++ b/.forgejo/workflows/build-image.yaml @@ -9,11 +9,11 @@ jobs: - uses: actions/checkout@v4 - run: cd ${{ env.GITHUB_WORKSPACE }} - name: 'Log in to registry' - uses: 'actions/podman-login@v1' - with: - registry: ${{ vars.REGISTRY_DOMAIN }} - username: ${{ vars.REGISTRY_USERNAME }} - password: ${{ secrets.REGISTRY_PASSWORD }} + run: > + buildah login + -u ${{ vars.REGISTRY_USERNAME }} + -p ${{ secrets.REGISTRY_PASSWORD }} + ${{ vars.REGISTRY_DOMAIN }} # base - run: mkdir cache @@ -51,7 +51,7 @@ jobs: --compression-format=zstd --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main.expiring - ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:$(buildah inspect -t image -f '{{ index .Labels "org.opencontainers.image.version" }}' ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main) + ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:$(buildah inspect -t image -f '{{ index .OCIv1.Config.Labels "org.opencontainers.image.version" }}' ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main) # base + ver4a's configuration - run: podman build . -f Dockerfile.kde-ver4a --userns container --security-opt no-new-privileges --no-cache --pull=never -v ${PWD}/cache:/var/cache/libdnf5:Z --squash --build-arg REGISTRY_DOMAIN=${{ vars.REGISTRY_DOMAIN }} --build-arg NAMESPACE=${{ vars.NAMESPACE }} -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-ver4a --annotation quay.expires-after=