Merge pull request #3288 from Uninett/feature/upgrade-other-docker-im…

…ages-to-bookworm

Upgrade auxiliary Docker images to Debian Bookworm

changelog.d/+auxiliary-docker-bookworm.changed.md

@@ -0,0 +1 @@
+Upgraded auxiliary Docker images (Graphite, snmp forwarder) to Debian Bookworm

tools/docker/graphite/Dockerfile

@@ -1,25 +1,21 @@
-FROM debian:buster
+FROM debian:bookworm
 
 #### Prepare the OS base setup ###
 
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN echo 'deb-src http://deb.debian.org/debian buster main' >> /etc/apt/sources.list.d/srcpkg.list && \
-    echo 'deb-src http://security.debian.org/debian-security buster/updates main' >> /etc/apt/sources.list.d/srcpkg.list && \
-    echo 'deb-src http://deb.debian.org/debian buster-updates main' >> /etc/apt/sources.list.d/srcpkg.list
+ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
     apt-get -y --no-install-recommends install \
             locales \
             sudo python3 supervisor \
-	    gnupg debian-keyring debian-archive-keyring ca-certificates
+	        gnupg debian-keyring debian-archive-keyring ca-certificates
 
 ARG TIMEZONE=Europe/Oslo
 ARG LOCALE=en_US.UTF-8
 ARG ENCODING=UTF-8
 RUN echo "${LOCALE} ${ENCODING}" > /etc/locale.gen && locale-gen ${LOCALE} && update-locale LANG=${LOCALE} LC_ALL=${LOCALE}
-ENV LANG ${LOCALE}
-ENV LC_ALL ${LOCALE}
+ENV LANG=${LOCALE}
+ENV LC_ALL=${LOCALE}
 RUN echo "${TIMEZONE}" > /etc/timezone && cp /usr/share/zoneinfo/${TIMEZONE} /etc/localtime
 
 RUN apt-get update \

tools/forward/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye
+FROM debian:bookworm
 RUN apt-get update && apt-get install -y openssh-server socat sudo tini
 RUN echo '%adm ALL=NOPASSWD: /usr/bin/socat' > /etc/sudoers.d/socat
 RUN chmod 0440 /etc/sudoers.d/socat