Hopefully fix building the CI images

inko-lang · Jan 17, 2025 · bf92012 · bf92012
1 parent 8c0b18c
commit bf92012
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
@@ -33,7 +33,6 @@ jobs:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: docker/setup-buildx-action@v3
       - name: Build image
         id: build
         uses: docker/build-push-action@v5
@@ -73,12 +72,9 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - uses: docker/setup-buildx-action@v3
-      - uses: docker/metadata-action@v5
-        id: meta
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}
       - name: Create and push manifest
         working-directory: ${{ runner.temp }}/digests
         run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+          docker buildx imagetools create \
+            -t "${{ env.REGISTRY }}/${{ env.NAMESPACE }}:${{ inputs.name }}" \
             $(printf '${{ env.REGISTRY }}/${{ env.NAMESPACE }}@sha256:%s ' *)
diff --git a/ci/docker/fedora/Dockerfile b/ci/docker/fedora/Dockerfile
@@ -7,7 +7,7 @@ ENV PATH /opt/cargo/bin:$PATH
 ENV RUSTUP_HOME /opt/rustup
 ENV CARGO_HOME /opt/cargo
 
-RUN sudo dnf install --assumeyes --quiet gcc make tar git rustup rclone \
+RUN dnf install --assumeyes --quiet gcc make tar git rustup rclone \
     llvm$LLVM_VERSION llvm$LLVM_VERSION-devel libstdc++-devel libffi-devel \
     zlib-devel