#462 build from source code (#463)

Author: GioF71

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

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        base: [ "noble" ]
+        base: [ "stable" ]
         build_mode: ["full", "renderer"]
 
     steps:
@@ -41,6 +41,7 @@ jobs:
           base_images[kinetic]=ubuntu:kinetic
           base_images[jammy]=ubuntu:jammy
           base_images[bookworm]=debian:bookworm-slim
+          base_images[stable]=debian:stable-slim
 
           image_name="${{secrets.DOCKER_USERNAME}}/upmpdcli"
 
@@ -114,7 +115,7 @@ jobs:
           fi
           echo "Building tags: ["${tags}"]"
           echo "RELEASE_TAGS=${tags}" >> $GITHUB_OUTPUT
-          echo "BASE_IMAGE=${select_base_image}" >> $GITHUB_OUTPUT
+          echo "USE_BASE_IMAGE=${select_base_image}" >> $GITHUB_OUTPUT
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -137,7 +138,7 @@ jobs:
           context: .
           build-args: |
             USE_APT_PROXY=N
-            BASE_IMAGE=${{ steps.prepare.outputs.BASE_IMAGE }}
+            USE_BASE_IMAGE=${{ steps.prepare.outputs.USE_BASE_IMAGE }}
             BUILD_MODE=${{ matrix.build_mode }}
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
           push: true

Dockerfile

@@ -1,77 +1,70 @@
-ARG BASE_IMAGE="${BASE_IMAGE:-ubuntu:noble}"
+ARG BASE_IMAGE="${BASE_IMAGE:-debian:stable-slim}"
 FROM ${BASE_IMAGE} AS base
-ARG BASE_IMAGE="${BASE_IMAGE:-ubuntu:noble}"
-ARG BUILD_MODE="${BUILD_MODE:-full}"
-ARG USE_APT_PROXY
-
-RUN mkdir -p /app/conf
-RUN mkdir -p /app/install
-
-COPY app/conf/01proxy /app/conf/
-
-RUN if [ "$USE_APT_PROXY" = "Y" ]; then \
-		echo "Using apt proxy"; \
-		cp /app/conf/01proxy /etc/apt/apt.conf.d/01proxy; \
-		echo /etc/apt/apt.conf.d/01proxy; \
-	else \
-		echo "Building without proxy"; \
-	fi
 
 ARG DEBIAN_FRONTEND=noninteractive
-
 RUN apt-get update
-RUN apt-get install -y ca-certificates
-
-RUN if [ "$BUILD_MODE" = "full" ]; then \
-		apt-get install -y python3 python3-pip; \
-	fi
-
-COPY app/install/* /app/install/
-RUN chmod u+x /app/install/*.sh
-RUN /app/install/setup.sh
-
-RUN apt-get install -y upmpdcli
-RUN apt-get install -y --no-install-recommends iproute2 grep
-
-RUN if [ "$BUILD_MODE" = "full" ]; then \
-		apt-get install -y \
-			upmpdcli-bbc \
-			upmpdcli-hra \
-			upmpdcli-qobuz \
-			upmpdcli-radio-browser \
-			upmpdcli-radio-paradise \
-			upmpdcli-mother-earth-radio \
-			upmpdcli-radios \
-			upmpdcli-subsonic \
-			upmpdcli-tidal \
-			upmpdcli-uprcl; \
-		fi
-
-RUN if [ "$BUILD_MODE" = "full" ]; then \
-		apt-get install -y \
-			recollcmd; \
-		fi
-
-RUN if [ "$BUILD_MODE" = "full" ]; then \
-		apt-get install -y exiftool; \
-	fi
-
-RUN if [ "$BUILD_MODE" = "full" ]; then \
-		apt-get install -y git; \
-	fi
-
-RUN apt-get install -y net-tools
 
+RUN apt-get -y install \
+    ca-certificates \
+    bash \
+    curl \
+    net-tools \
+    iproute2 \
+    grep \
+    git \
+    build-essential \
+    meson \
+    pkg-config \
+    cmake \
+    libexpat1-dev \
+    libmicrohttpd-dev \
+    libjsoncpp-dev \
+    libmpdclient-dev
+
+# create build directory
+WORKDIR /build
+
+# build npupnp
+RUN git clone https://framagit.org/medoc92/npupnp.git
+WORKDIR /build/npupnp
+RUN meson setup --prefix /usr build
+WORKDIR /build/npupnp/build
+RUN ninja
+RUN meson install
+
+# build libupnpp
+WORKDIR /build
+RUN git clone https://framagit.org/medoc92/libupnpp.git
+WORKDIR /build/libupnpp
+RUN meson setup --prefix /usr build
+WORKDIR /build/libupnpp/build
+RUN ninja
+RUN meson install
+
+# build upmpdcli
+ARG BRANCH_NAME=upmpdcli-v1.9.3
+RUN echo "Using branch [${BRANCH_NAME}}] for upmpdcli ..."
+WORKDIR /build
+RUN git clone --depth 1 --branch ${BRANCH_NAME} https://framagit.org/medoc92/upmpdcli.git
+
+WORKDIR /build/upmpdcli
+RUN meson setup --prefix /usr build
+WORKDIR /build/upmpdcli/build
+RUN ninja
+RUN meson install
+
+ARG BUILD_MODE=full
+
+WORKDIR /install
+COPY app/install/* /install/
+RUN chmod +x /install/*.sh
+RUN if [ "${BUILD_MODE}" = "full" ]; then /bin/sh -c /install/mediaserver-libraries.sh; fi
+RUN if [ "${BUILD_MODE}" = "full" ]; then /bin/sh -c /install/mediaserver-python-packages.sh; fi
+
+RUN apt-get -y remove pkg-config meson cmake build-essential libexpat1-dev
 RUN apt-get -y autoremove
-RUN	rm -rf /var/lib/apt/lists/*
-
-RUN if [ "$USE_APT_PROXY" = "Y" ]; then \
-		rm /etc/apt/apt.conf.d/01proxy; \
-	fi
-
-RUN rm -Rf /app/install
-
-RUN echo $BUILD_MODE > /app/conf/build_mode.txt
+RUN	rm -Rf /var/lib/apt/lists/*
+RUN rm -Rf /build
 
 FROM scratch
 COPY --from=base / /

app/bin/run-upmpdcli.sh

@@ -5,6 +5,9 @@
 # 2 Invalid RENDERER_MODE value
 # 3 Invalid argument
 
+# display upmpdcli version.
+upmpdcli -v
+
 USER_CONF_PATH=/user/config
 
 current_user_id=$(id -u)

app/conf/01proxy

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -ex
+
+echo "BUILD_MODE=[${BUILD_MODE}]"
+
+if [ "${BUILD_MODE}" = "full" ]; then
+    apt-get -y install curl
+    apt-get -y install python3
+    apt-get -y install exiftool
+    apt-get -y install recoll recollcmd python3-recoll python3-mutagen python3-waitress python3-bottle sqlite3
+    apt-get -y install python3-pip
+fi

app/install/mediaserver-libraries.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -ex
+
+echo "BUILD_MODE=[${BUILD_MODE}]"
+
+if [ "${BUILD_MODE}" = "full" ]; then
+    pip install --break-system-packages subsonic-connector
+    pip install --break-system-packages tidalapi
+    pip install --break-system-packages pyradios
+fi