ci(image): refactor

4m-mazi · Aug 20, 2024 · f45a2f6 · f45a2f6
1 parent 7d82a2d
commit f45a2f6
Showing 1 changed file with 13 additions and 20 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -141,31 +141,24 @@ jobs:
             type=edge
             type=ref,event=branch
 
-      - name: Build Image (linux/amd64)
+      - name: Build Images
         run: |
-          newcontainer=$(buildah from --platform=linux/amd64 scratch)
-          buildah copy --chmod=0755 $newcontainer ./artifact/x86_64-unknown-linux-musl/${{ needs.env.outputs.BINARY_NAME }} /${{ needs.env.outputs.BINARY_NAME }}
-          buildah config --entrypoint='["./${{ needs.env.outputs.BINARY_NAME }}"]' $newcontainer
+          build() {
+            newcontainer=$(buildah from --platform="$1" scratch)
+            buildah copy --chmod=0755 $newcontainer ./artifact/"$2"/${{ needs.env.outputs.BINARY_NAME }} /${{ needs.env.outputs.BINARY_NAME }}
+            buildah config --entrypoint='["./${{ needs.env.outputs.BINARY_NAME }}"]' $newcontainer
 
-          buildah config --author="Mogyuchi" $(awk '{print "--label=" $0}' <<< "${{ steps.meta.outputs.labels }}") $newcontainer
-          buildah inspect $newcontainer
+            buildah config --author="Mogyuchi" $(awk '{print "--label=" $0}' <<< "${{ steps.meta.outputs.labels }}") $newcontainer
+            buildah inspect $newcontainer
 
-          buildah commit --manifest=localhost/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }} $newcontainer
-          buildah rm $newcontainer
-      - name: Build Image (linux/arm64)
-        run: |
-          newcontainer=$(buildah from --platform=linux/arm64 scratch)
-          buildah copy --chmod=0755 $newcontainer ./artifact/aarch64-unknown-linux-musl/${{ needs.env.outputs.BINARY_NAME }} /${{ needs.env.outputs.BINARY_NAME }}
-          buildah config --entrypoint='["./${{ needs.env.outputs.BINARY_NAME }}"]' $newcontainer
-
-          buildah config --author="Mogyuchi" $(awk '{print "--label=" $0}' <<< "${{ steps.meta.outputs.labels }}") $newcontainer
-          buildah inspect $newcontainer
-
-          buildah commit --manifest=localhost/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }} $newcontainer
-          buildah rm $newcontainer
+            buildah commit --manifest=localhost/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }} $newcontainer
+            buildah rm $newcontainer
+          }
+          build linux/amd64 x86_64-unknown-linux-musl
+          build linux/arm64 aarch64-unknown-linux-musl
 
       - id: push
         name: Push To GHCR
         run: |
           buildah manifest inspect localhost/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}
-          echo "${{ steps.meta.outputs.tags }}" | xargs -I{} --max-args=1 buildah --log-level=trace manifest push --creds=${{ github.actor }}:${{ secrets.GITHUB_TOKEN }} --all localhost/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }} docker://{}
+          cat <<<"${{ steps.meta.outputs.tags }}" | xargs -I{} --max-args=1 buildah --log-level=trace manifest push --creds=${{ github.actor }}:${{ secrets.GITHUB_TOKEN }} --all localhost/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }} docker://{}