Instrument some work for multi-version builds

Author: csparker247

.github/workflows/build_docker.yml

@@ -28,6 +28,13 @@ jobs:
             type=semver,prefix=base.,pattern={{major}}.{{minor}}
             type=raw,prefix=base.,value=edge,enable={{is_default_branch}}
             type=raw,prefix=base.,value=latest,enable=${{ github.event_name == 'release' }}
+      
+      - name: Get major version
+        id: major_version
+        env:
+          version: ${{ steps.meta.outputs.version }}
+        run: |
+          echo "major_version=${version%%.*}" >> "$GITHUB_OUTPUT"
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -50,6 +57,7 @@ jobs:
         with:
           file: ./Dockerfile.base
           build-args: |
+            BASE_IMAGE_VERSION=${{ steps.major_version.outputs.version || bookworm-slim }}
             CI_DOCKER_VERSION=${{ steps.meta.outputs.version || github.sha }}
           push: ${{ github.event_name != 'pull_request' }}
           platforms: linux/amd64,linux/arm64

Dockerfile.base

@@ -1,7 +1,8 @@
 # Build args
+ARG BASE_IMAGE_VERSION=bookworm-slim
 ARG CI_DOCKER_VERSION
 
-FROM debian:bookworm-slim
+FROM debian:$BASE_IMAGE_VERSION
 LABEL org.opencontainers.image.authors="Seth Parker <[email protected]>"
 LABEL org.opencontainers.image.title="ci-docker (base)"
 LABEL org.opencontainers.image.description="Base system packages"
@@ -14,11 +15,14 @@ ENV CI_DOCKER_VERSION=$CI_DOCKER_VERSION
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US:en
 ENV LC_ALL=en_US.UTF-8
-ENV QT_PLUGIN_PATH=/usr/local/Qt-6.7.2/plugins
+ENV QT_PLUGIN_PATH=/usr/local/Qt-6.10.0/plugins
 
 # Install apt sources
-RUN echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \
-&& apt-get clean && apt-get -y update
+RUN if [ "${BASE_IMAGE_VERSION}" = "bookworm-slim" ]; then  \
+      echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list; \
+      export BACKPORTS_TAG="-t bookworm-backports"
+    fi \
+    && apt-get clean && apt-get -y update
 RUN apt-get install --fix-missing --fix-broken -y \
     build-essential \
     curl \
@@ -66,13 +70,13 @@ RUN apt-get install --fix-missing --fix-broken -y \
     zlib1g-dev \
 && ln -s /usr/bin/python3 /usr/bin/python \
 && sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen \
-&& apt-get -t bookworm-backports install -y cmake \
+&& apt-get ${BACKPORTS_TAG} install -y cmake \
 && apt-get purge && rm -rf /var/lib/apt/lists/*
 
 # Install Qt6
-RUN curl -O -L https://download.qt.io/archive/qt/6.7/6.7.2/single/qt-everywhere-src-6.7.2.tar.xz \
-&& tar -xf qt-everywhere-src-6.7.2.tar.xz \
-&& cd qt-everywhere-src-6.7.2/ \
+RUN curl -O -L https://download.qt.io/archive/qt/6.10/6.10.0/single/qt-everywhere-src-6.10.0.tar.xz \
+&& tar -xf qt-everywhere-src-6.10.0.tar.xz \
+&& cd qt-everywhere-src-6.10.0/ \
 && ./configure -opensource -nomake examples -nomake tests -bundled-xcb-xinput -confirm-license \
 && cmake --build . --parallel \
 && cmake --install . \

build.sh

@@ -6,6 +6,7 @@ timestamp() {
     date -u +'%Y-%m-%dT%H:%M:%SZ'
 }
 
+BASE_IMAGE_VERSION=bookworm-slim
 REPO=ghcr.io/educelab/ci-docker
 VER_MAJOR=12
 VER_MINOR=1
@@ -41,7 +42,7 @@ for TYPE in base dynamic static; do
   docker buildx build \
     -f Dockerfile.${TYPE} \
     --platform linux/amd64,linux/arm64 \
-    --build-arg CI_DOCKER_VERSION=${VER_FULL} \
+    --build-arg BASE_IMAGE_VERSION=${BASE_IMAGE_VERSION} CI_DOCKER_VERSION=${VER_FULL} \
     --provenance false \
     $(labels) \
     $(tags ${TYPE}) \