Update for Mongo 8.2, optimize image pull

Include rapid release series 8.2 in addition to the stable 8.0 releases.

For Mongo versions >= 8, remove the need for pulling Debian slim.

Author: stevekerrison

.github/workflows/docker-publish.yml

@@ -43,7 +43,7 @@ jobs:
     # Build for multiple mongo versions
     strategy:
       matrix:
-        mongo: [6, 7, 8]
+        mongo: [6, 7, 8.0, 8.2]
 
     steps:
       - name: Checkout repository
@@ -86,6 +86,15 @@ jobs:
             type=raw,value=mongo${{ matrix.mongo }}
             type=raw,value=latest,enable=${{ matrix.mongo == 7 }}
 
+      # For mongo versions >= 8, we can avoid pulling debian-slim when building
+      # because Ubuntu noble is used as the base, which has qemu 8.2 in it.
+      - name: Check mongo version to choose qemu source
+        id: qemu_source_check
+        uses: madhead/semver-utils@latest
+        with:
+          version: ${{ matrix.mongo }}
+          satisfies: >=8
+
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
@@ -94,7 +103,9 @@ jobs:
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
-          build-args: mongo_tag=${{ matrix.mongo }}
+          build-args: |
+            mongo_tag=${{ matrix.mongo }}
+            qemu_source=${{ steps.qemu_source_check.outputs.satisfies && format('{0}:{1}', 'mongo', matrix.mongo) || 'debian:stable-slim' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha

Dockerfile

@@ -4,11 +4,13 @@
 
 # Specify a different source tag if you want with --build-arg mongo_tag=...
 ARG mongo_tag=7.0
+ARG qemu_source=debian:stable-slim
 
-# Mongo builds use Ubuntu Jammy, and its version of qemu is too old to emulate
+# Mongo <= 7 builds use Ubuntu Jammy, and its version of qemu is too old to emulate
 # AVX. However, the binaries are static, so it doesn't matter if we pull them
-# in from somewhere else. We'll use Debian slim
-FROM debian:stable-slim AS qemu
+# in from somewhere else. We'll use Debian slim in such cases, otherwise we'll
+# just re-use the Mongo 8+ image...
+FROM ${qemu_source} AS qemu
 
 RUN apt-get update \
     && apt-get -y install --no-install-recommends qemu-user-static

README.md

@@ -41,7 +41,8 @@ docker pull ghcr.io/stevekerrison/mongo-qemu-avx:mongo{mongo_version}
 Examples:
 
 ```
-docker pull ghcr.io/stevekerrison/mongo-qemu-avx:mongo8
+docker pull ghcr.io/stevekerrison/mongo-qemu-avx:mongo8.2
+docker pull ghcr.io/stevekerrison/mongo-qemu-avx:mongo8.0
 docker pull ghcr.io/stevekerrison/mongo-qemu-avx:mongo7
 docker pull ghcr.io/stevekerrison/mongo-qemu-avx:mongo6
 ```
@@ -55,7 +56,7 @@ is idle for too long (60 days), then the scheduled GitHub Action is disabled.
 
 If you want to build for yourself, here's how...
 
-The Dockerfile uses Debian's `qemu-user-static` package to source
+The Dockerfile uses Debian/Ubuntu's `qemu-user-static` package to source
 `qemu-x86_64-static` and drop it into the modified `mongo` image. You don't
 need `qemu` installed on your host system when building.
 
@@ -76,6 +77,21 @@ The default `mongo` version is `7.0` but you can specify the build arg
 docker build -t mongo-qemu:latest --build-arg mongo_tag=6.0 .
 ```
 
+##### Avoid using the Debian image to source `qemu`
+
+If you want `mongo>=8` then its container is based on Ubuntu Noble,
+which has a sufficiently up to date `qemu` version. The build arg
+`qemu_source=mongo:${your mongo tag}` will still use two-stage
+building to install/copy `qemu`, but will do so using the same source
+image, saving you a pull:
+
+```
+docker build -t mongo-qemu:latest \
+    --build-arg mongo_tag=8.0 \
+    --build-arg qemu_source=mongo:8.0
+```
+
+
 ### How to use
 
 Refer to the newly built container by tag, or incorporate it into your