Merge branch 'main' into build/libreoffice-arm64

Unstructured-IO · Jun 26, 2024 · 057d1d7 · 057d1d7
2 parents 2c9eef4 + 7e30303
commit 057d1d7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         architecture: ["arm64", "amd64"]
-        image: ["wolfi-base", "rocky9.2-10-gpu", "rocky9.2-10-slim", "rocky9.2-10-cpu"]
+        image: ["wolfi-base", "rocky9.2-gpu", "rocky9.2-slim", "rocky9.2-cpu"]
     runs-on: ubuntu-latest-m
     needs: [set-short-sha]
     env:
@@ -65,7 +65,7 @@ jobs:
   publish-images:
     strategy:
       matrix:
-        image: ["wolfi-base", "rocky9.2-10-gpu","rocky9.2-10-slim", "rocky9.2-10-cpu" ]
+        image: ["wolfi-base", "rocky9.2-gpu","rocky9.2-slim", "rocky9.2-cpu" ]
     env:
       SHORT_SHA: ${{ needs.set-short-sha.outputs.short_sha }}
     runs-on: ubuntu-latest
@@ -83,18 +83,26 @@ jobs:
         password: ${{ secrets.QUAY_IO_ROBOT_TOKEN }}
     - name: Pull AMD image
       run: |
-        docker pull --platform linux/amd64 $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-amd64-$SHORT_SHA
+        docker pull --platform linux/amd64 $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-amd64
         docker tag $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-amd64-$SHORT_SHA $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-amd64
         docker push $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-amd64
     - name: Pull ARM image
       run: |
-        docker pull --platform linux/arm64 $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-arm64-$SHORT_SHA
+        docker pull --platform linux/arm64 $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-arm64
         docker tag $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-arm64-$SHORT_SHA $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-arm64
         docker push $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-arm64
-    - name: Push multiarch manifest
+    - name: Push multiarch manifest with short SHA
+      env:
+        IMAGE_TAG: ${{ matrix.image }}-$SHORT_SHA
       run: |
-        docker manifest create $DOCKER_REPOSITORY/$DOCKER_IMAGE:${{ matrix.image }} $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-amd64 $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-arm64
-        docker manifest push $DOCKER_REPOSITORY/$DOCKER_IMAGE:${{ matrix.image }}
+        docker manifest create $DOCKER_REPOSITORY/$DOCKER_IMAGE:${IMAGE_TAG} $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-amd64 $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-arm64
+        docker manifest push $DOCKER_REPOSITORY/$DOCKER_IMAGE:${IMAGE_TAG}
+    - name: Update latest multiarch manifest
+      env:
+        IMAGE_TAG: ${{ matrix.image }}-latest
+      run: |
+        docker manifest create $DOCKER_REPOSITORY/$DOCKER_IMAGE:${IMAGE_TAG} $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-amd64 $DOCKER_BUILD_REPOSITORY:${{ matrix.image }}-arm64
+        docker manifest push $DOCKER_REPOSITORY/$DOCKER_IMAGE:${IMAGE_TAG}
 
   shellcheck:
     runs-on: ubuntu-latest

diff --git a/dockerfiles/rocky9.2-10-cpu/Dockerfile → dockerfiles/rocky9.2-cpu/Dockerfile b/dockerfiles/rocky9.2-10-cpu/Dockerfile → dockerfiles/rocky9.2-cpu/Dockerfile
diff --git a/dockerfiles/rocky9.2-10-gpu/Dockerfile → dockerfiles/rocky9.2-gpu/Dockerfile b/dockerfiles/rocky9.2-10-gpu/Dockerfile → dockerfiles/rocky9.2-gpu/Dockerfile
diff --git a/dockerfiles/rocky9.2-10-slim/Dockerfile → dockerfiles/rocky9.2-slim/Dockerfile b/dockerfiles/rocky9.2-10-slim/Dockerfile → dockerfiles/rocky9.2-slim/Dockerfile
diff --git a/scripts/build-base-images.sh b/scripts/build-base-images.sh
@@ -6,7 +6,7 @@ BUILD_REPO="${BUILD_REPO:-build-base-images}"
 PIP_VERSION="${PIP_VERSION:-22.2.1}"
 GITHUB_REF="${GITHUB_REF:-none}"
 DOCKER_PLATFORM="${DOCKER_PLATFORM:-linux/amd64}"
-DOCKERFILE="${DOCKERFILE:-rocky9.2-9}"
+DOCKERFILE="${DOCKERFILE:-rocky9.2}"
 CI="${CI:-false}"
 SHORT_SHA="${SHORT_SHA:-$(git rev-parse --short HEAD)}"