Merge pull request #1784 from fanuware/update-container-to-debian-trixie

Update containers to Debian Trixie

Author: jluebbe

dockerfiles/Dockerfile

@@ -1,32 +1,29 @@
-FROM debian:bookworm-slim AS labgrid-base
-ARG VERSION
+FROM debian:trixie-slim AS labgrid-base
+ARG VERSION=0.0.0
 
 LABEL maintainer="eha@deif.com"
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 COPY ./ /opt/labgrid/
 
-RUN set -e ;\
-    apt update -q=2 ;\
-    apt install -q=2 --yes --no-install-recommends python3 python3-dev python3-pip python3-setuptools git build-essential ;\
-    pip3 install --break-system-packages -U pip;\
-    apt clean ;\
-    rm -rf /var/lib/apt/lists/* ;\
-    cd /opt/labgrid ;\
-    SETUPTOOLS_SCM_PRETEND_VERSION="$VERSION" pip3 install --break-system-packages --no-cache-dir .
+RUN apt update -q=2 && \
+    apt install -q=2 --yes --no-install-recommends python3 python3-dev python3-pip python3-setuptools git build-essential && \
+    rm -rf /var/lib/apt/lists/* && \
+    pip3 config --site set global.break-system-packages true && \
+    pip3 config --site set global.root-user-action ignore && \
+    cd /opt/labgrid && \
+    SETUPTOOLS_SCM_PRETEND_VERSION="$VERSION" pip3 install --no-cache-dir .
 
 #
 # Client
 #
 FROM labgrid-base AS labgrid-client
 ARG VERSION
 
-RUN set -e ;\
-    pip3 install --break-system-packages yq ;\
-    apt update -q=2 ;\
-    apt install -q=2 --yes --no-install-recommends microcom openssh-client rsync jq qemu-system qemu-utils ;\
-    apt clean ;\
+RUN pip3 install yq && \
+    apt update -q=2  && \
+    apt install -q=2 --yes --no-install-recommends microcom openssh-client rsync jq qemu-system qemu-utils && \
     rm -rf /var/lib/apt/lists/*
 
 CMD ["/bin/bash"]
@@ -53,10 +50,8 @@ ARG VERSION
 
 COPY dockerfiles/exporter/entrypoint.sh /entrypoint.sh
 
-RUN set -e ;\
-    apt update -q=2 ;\
-    apt install -q=2 --yes --no-install-recommends ser2net ;\
-    apt clean ;\
+RUN apt update -q=2 && \
+    apt install -q=2 --yes --no-install-recommends ser2net && \
     rm -rf /var/lib/apt/lists/*
 
 VOLUME /opt/conf

dockerfiles/staging/dut/Dockerfile

@@ -1,17 +1,14 @@
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 
 LABEL org.opencontainers.image.authors="mail@krevsbech.dk"
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN set -e ;\
-    apt update -q=2 ;\
-    apt install -q=2 --yes --no-install-recommends openssh-server;\
-    apt clean ;\
-    rm -rf /var/lib/apt/lists/* ;\
-    mkdir /var/run/sshd ;\
-    echo 'root:PASSWORD' | chpasswd ;\
-    echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config ;\
+RUN apt update -q=2 && \
+    apt install -q=2 --yes --no-install-recommends openssh-server && \
+    rm -rf /var/lib/apt/lists/* && \
+    echo 'root:PASSWORD' | chpasswd && \
+    echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config && \
     sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
     # SSH login fix. Otherwise user is kicked off after login