Fix base image tags and aarch64 centos image.

Author: Alexhuszagh

.github/workflows/ci.yml

@@ -154,10 +154,11 @@ jobs:
           labels: |
             ${{ fromJSON(steps.prepare-meta.outputs.labels) }}
 
+      # always use the main branch, since we need it for the base image
       - name: Build Docker image
         id: build-docker-image
         timeout-minutes: 60
-        run: cargo xtask build-docker-image -v "${IMAGE}.${SUB}"
+        run: cargo xtask build-docker-image -v --tag main "${IMAGE}.${SUB}"
         env:
           IMAGE: ${{ matrix.image }}
           SUB: ${{ matrix.sub }}
@@ -167,16 +168,15 @@ jobs:
 
       - name: Save Docker Image
         id: save-docker-image
-        run: docker save "${IMAGE}:${TAG}" -o "${IMAGE}-${TAG}-${SUB}.tar"
+        run: docker save "${IMAGE}:main" -o "${IMAGE}-main-${SUB}.tar"
         env:
           IMAGE: ${{ matrix.image }}
           SUB: ${{ matrix.sub }}
-          TAG: ${{ env.GITHUB_REF_NAME }}
 
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ matrix.image }}-${{ matrix.sub }}-image-tarball
-          path: ${{ matrix.image }}-${{ matrix.sub }}-${{ env.GITHUB_REF_NAME }}.tar
+          path: ${{ matrix.image }}-main-${{ matrix.sub }}.tar
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1

docker/Dockerfile.aarch64-unknown-linux-gnu.centos

@@ -6,16 +6,7 @@ COPY lib.sh /
 COPY linux-image.sh /
 RUN /linux-image.sh aarch64
 
-FROM centos:7
-
-COPY common.sh lib.sh /
-RUN /common.sh
-
-COPY cmake.sh /
-RUN /cmake.sh
-
-COPY xargo.sh /
-RUN /xargo.sh
+FROM ghcr.io/cross-rs/base:centos-main
 
 COPY qemu.sh /
 RUN /qemu.sh aarch64 softmmu