[Maintenance] Wrong base image selection #251 (#252)

Author: GioF71

.github/workflows/docker-multi-arch.yml

@@ -34,6 +34,20 @@ jobs:
           distro_id=${{ matrix.base }}
           image_name=${{secrets.DOCKER_USERNAME}}/mpd-alsa
 
+          declare -A mpd_compiler_base_images
+          mpd_compiler_base_images[bullseye]="giof71/mpd-compiler:bullseye"
+          mpd_compiler_base_images[jammy]="giof71/mpd-compiler:jammy"
+          mpd_compiler_base_images[kinetic]="giof71/mpd-compiler:kinetic"
+
+          select_compiler_image=${mpd_compiler_base_images[${{ matrix.base }}]}
+
+          declare -A libfmt_dict
+          libfmt_dict[bullseye]=libfmt7
+          libfmt_dict[jammy]=libfmt-dev
+          libfmt_dict[kinetic]=libfmt-dev
+
+          select_libfmt_package_name=${libfmt_dict[${{ matrix.base }}]}
+
           declare -A base_image_from_matrix
           base_image_from_matrix[bookworm]=debian:bookworm-slim
           base_image_from_matrix[buster]=debian:buster-slim
@@ -108,7 +122,9 @@ jobs:
           fi
           echo "Building tags: ["${tags}"]"
           echo "RELEASE_TAGS=${tags}" >> $GITHUB_ENV
-          echo "BASE_IMAGE=${base_image}" >> $GITHUB_ENV
+          echo "BASE_IMAGE=${select_compiler_image}" >> $GITHUB_ENV
+          echo "INTEGER_UPSAMPLING_SUPPORT=yes" >> $GITHUB_ENV
+          echo "LIBFMT_PACKAGE_NAME=${select_libfmt_package_name}" >> $GITHUB_ENV
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -131,6 +147,8 @@ jobs:
           context: .
           build-args: |
             BASE_IMAGE=${{ env.BASE_IMAGE }}
+            INTEGER_UPSAMPLING_SUPPORT=${{ env.INTEGER_UPSAMPLING_SUPPORT }}
+            LIBFMT_PACKAGE_NAME=${{ env.LIBFMT_PACKAGE_NAME }}
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
           push: true
           tags: ${{ env.RELEASE_TAGS }}

Dockerfile

@@ -1,13 +1,20 @@
-ARG BASE_IMAGE_TAG="${BASE_IMAGE_TAG:-bullseye-slim}"
-FROM giof71/mpd-compiler:${BASE_IMAGE_TAG} AS BASE
+ARG BASE_IMAGE="${BASE_IMAGE}"
+#FROM giof71/mpd-compiler:${BASE_IMAGE_TAG} AS BASE
+FROM ${BASE_IMAGE} AS BASE
 
+ARG INTEGER_UPSAMPLING_SUPPORT="${INTEGER_UPSAMPLING_SUPPORT:-no}"
 ARG USE_APT_PROXY
+ARG LIBFMT_PACKAGE_NAME
 
 RUN mkdir -p /app/conf
 
-COPY app/conf/01-apt-proxy /app/conf/
-
 RUN echo "USE_APT_PROXY=["${USE_APT_PROXY}"]"
+RUN echo "INTEGER_UPSAMPLING_SUPPORT=["${INTEGER_UPSAMPLING_SUPPORT}"]"
+RUN echo "LIBFMT_PACKAGE_NAME=["${LIBFMT_PACKAGE_NAME}"]"
+
+RUN echo $INTEGER_UPSAMPLING_SUPPORT > /app/conf/integer_upsampling_support.txt
+
+COPY app/conf/01-apt-proxy /app/conf/
 
 RUN if [ "${USE_APT_PROXY}" = "Y" ]; then \
     echo "Builind using apt proxy"; \
@@ -25,7 +32,7 @@ RUN apt-get install -y --no-install-recommends alsa-utils
 RUN apt-get install -y --no-install-recommends libasound2-plugin-equal
 RUN apt-get install -y --no-install-recommends pulseaudio-utils
 RUN apt-get install -y --no-install-recommends mpdscribble
-RUN apt-get install -y --no-install-recommends libfmt7
+RUN apt-get install -y --no-install-recommends $LIBFMT_PACKAGE_NAME
 RUN apt-get install -y --no-install-recommends libsidplay2
 RUN apt-get install -y --no-install-recommends libsidutils0
 RUN apt-get install -y --no-install-recommends libresid-builder-dev

build.sh

@@ -6,13 +6,19 @@
 
 declare -A base_image_tags
 
-base_image_tags[bookworm]=bookworm-slim
-base_image_tags[buster]=buster-slim
-base_image_tags[bullseye]=bullseye-slim
-base_image_tags[jammy]=jammy
-base_image_tags[kinetic]=kinetic
-base_image_tags[focal]=focal
-base_image_tags[bionic]=bionic
+base_image_tags[bullseye]=giof71/mpd-compiler:bullseye
+base_image_tags[jammy]=giof71/mpd-compiler:jammy
+base_image_tags[kinetic]=giof71/mpd-compiler:kinetic
+
+declare -A integer_upsampling_support_dict
+integer_upsampling_support_dict[bullseye]=yes
+integer_upsampling_support_dict[jammy]=yes
+integer_upsampling_support_dict[kinetic]=yes
+
+declare -A libfmt_dict
+libfmt_dict[bullseye]=libfmt7
+libfmt_dict[jammy]=libfmt-dev
+libfmt_dict[kinetic]=libfmt-dev
 
 DEFAULT_BASE_IMAGE=bullseye
 DEFAULT_TAG=local
@@ -44,6 +50,19 @@ if [ -z "${selected_image_tag}" ]; then
   exit 2
 fi
 
+integer_upsampling_support=${integer_upsampling_support_dict[$base_image_tag]}
+if [ -z "${integer_upsampling_support}" ]; then
+  echo "Integer upsampling support table entry missing for ["${base_image_tag}"]"
+  exit 2
+fi
+
+libfmt_package_name=${libfmt_dict[$base_image_tag]}
+if [ -z "${libfmt_package_name}" ]; then
+  echo "LibFmt package table entry missing for ["${base_image_tag}"]"
+  exit 2
+fi
+
+
 if [ -z "${proxy}" ]; then
   proxy="N"
 fi
@@ -60,11 +79,15 @@ if [ -z "${git_branch}" ]; then
   git_branch="${DEFAULT_GIT_VERSION}"
 fi
 
-echo "Base Image Tag: ["$selected_image_tag"]"
-echo "Build Tag: ["$tag"]"
-echo "Proxy: ["$proxy"]"
+echo "Base Image Tag: [$selected_image_tag]"
+echo "Integer Upsampling support: [$integer_upsampling_support]"
+echo "Package name libfmt: [$libfmt_package_name]"
+echo "Build Tag: [$tag]"
+echo "Proxy: [$proxy]"
 
 docker build . \
-    --build-arg BASE_IMAGE_TAG=${selected_image_tag} \
+    --build-arg BASE_IMAGE=${selected_image_tag} \
     --build-arg USE_APT_PROXY=${proxy} \
+    --build-arg INTEGER_UPSAMPLING_SUPPORT=${integer_upsampling_support} \
+    --build-arg LIBFMT_PACKAGE_NAME=${libfmt_package_name} \
     -t giof71/mpd-alsa:$tag

doc/change-history.md

@@ -2,6 +2,7 @@
 
 Date|Major Changes
 :---|:---
+2023-03-20|Fixed build base image (see issue [#251](https://github.com/GioF71/mpd-alsa-docker/issues/251) issue)
 2023-03-06|Mentioning mpdscribble version in `README.doc`
 2023-03-06|Add `kinetic` build and set to latest
 2023-02-11|Dropped `OUTPUT_MODE` (including *deprecated* `ALSA` mode)