From 246abc52031e25be1bdb6c3cb428ad7972dbf079 Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Mon, 18 Mar 2024 00:52:08 +0100 Subject: [PATCH] Update Dockerfile --- Dockerfile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index bca8f6bd..7fea4f19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,14 @@ # syntax=docker/dockerfile:1 ARG TARGETPLATFORM ARG PYTHON_VERSION="3.12" -ARG DEBIAN_VERSION="bookworm" ##################################################################### # # # Build Wheels # # # ##################################################################### -FROM python:${PYTHON_VERSION}-{DEBIAN_VERSION}-slim as wheels-builder +FROM python:${PYTHON_VERSION}-slim as wheels-builder ARG TARGETPLATFORM -ARG DEBIAN_VERSION # Install buildtime packages RUN set -x \ @@ -38,17 +36,16 @@ RUN set -x \ # Final Image # # # ##################################################################### -FROM python:${PYTHON_VERSION}-{DEBIAN_VERSION}-slim AS final-build +FROM python:${PYTHON_VERSION}-slim AS final-build WORKDIR /app # Required to persist build arg ARG MASS_VERSION ARG TARGETPLATFORM -ARG DEBIAN_VERSION RUN set -x \ - # add backports repo - && sh -c 'echo "deb http://deb.debian.org/debian {DEBIAN_VERSION}-backports main" >> /etc/apt/sources.list' \ + # add bookworm backports repo + && sh -c 'echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/sources.list' \ && apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \ @@ -63,8 +60,8 @@ RUN set -x \ cifs-utils \ libnfs-utils \ libjemalloc2 \ - # install snapcast server 0.27 from backports - && apt-get install -y --no-install-recommends -t {DEBIAN_VERSION}-backports snapserver \ + # install snapcast server 0.27 from bookworm backports + && apt-get install -y --no-install-recommends -t bookworm-backports snapserver \ # cleanup && rm -rf /tmp/* \ && rm -rf /var/lib/apt/lists/* -- 2.34.1