Fix Docker build failures by updating from Debian bullseye to bookworm

client-vnc/Dockerfile

@@ -1,8 +1,8 @@
 ARG DOCKER_REGISTRY_URL
 ARG ONEC_VERSION
-FROM ${DOCKER_REGISTRY_URL}/onec-client:${ONEC_VERSION} as base
+FROM ${DOCKER_REGISTRY_URL}/onec-client:${ONEC_VERSION} AS base
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 ARG ONEC_VERSION
 
 COPY --from=base /opt /opt
@@ -25,10 +25,10 @@ RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     dirmngr \
     gnupg \
-  && echo "deb http://http.debian.net/debian/ bullseye main contrib non-free" > /etc/apt/sources.list \
-  && echo "deb http://http.debian.net/debian/ bullseye-backports main" >> /etc/apt/sources.list \
-  && echo "deb http://http.debian.net/debian/ bullseye-proposed-updates main contrib non-free" >> /etc/apt/sources.list \
-  && echo "deb http://security.debian.org/debian-security/ bullseye-security main contrib non-free" >> /etc/apt/sources.list \
+  && echo "deb http://http.debian.net/debian/ bookworm main contrib non-free" > /etc/apt/sources.list \
+  && echo "deb http://http.debian.net/debian/ bookworm-backports main" >> /etc/apt/sources.list \
+  && echo "deb http://http.debian.net/debian/ bookworm-proposed-updates main contrib non-free" >> /etc/apt/sources.list \
+  && echo "deb http://security.debian.org/debian-security/ bookworm-security main contrib non-free" >> /etc/apt/sources.list \
   && echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections \
   && apt-get update \
   && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -49,13 +49,14 @@ RUN apt-get update \
       x11vnc \
       iproute2 \
       libglu1-mesa \
-  # Install libpng12-0 from xenial
-  && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 40976EAF437D05B5 \
-  && echo "deb http://security.ubuntu.com/ubuntu xenial-security main" > /etc/apt/sources.list.d/xenial-security.list \
-  && apt-get update \
-  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+  # Install libpng12-0 from debian-snapshot
+  && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 7638D0442B90D010 8B48AD6246925553 \
+  && echo "deb http://snapshot.debian.org/archive/debian/20160413T160058Z/ unstable main" > /etc/apt/sources.list.d/debian-snapshot.list \
+  && apt-get -o Acquire::AllowInsecureRepositories=true -o Acquire::Check-Valid-Until=false update \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated --no-install-recommends \
+      usrmerge \  
       libpng12-0 \
-  && rm -rf  /etc/apt/sources.list.d/xenial-security.list \
+  && rm -rf  /etc/apt/sources.list.d/debian-snapshot.list \
   && apt-get update \
   # Install libwebkitgtk from stretch
   && echo "deb http://archive.debian.org/debian/ stretch main contrib non-free" > /etc/apt/sources.list.d/stretch.list \
@@ -68,15 +69,15 @@ RUN apt-get update \
     /var/lib/apt/lists/* \
     /var/cache/debconf \
   && localedef -i ru_RU -c -f UTF-8 -A /usr/share/locale/locale.alias ru_RU.UTF-8
-ENV LANG ru_RU.UTF-8
+ENV LANG=ru_RU.UTF-8
 
 # remove DST Root CA X3 cert if it exists
 COPY ./scripts/remove-dst-root-ca-x3.sh /remove-dst-root-ca-x3.sh
 RUN chmod +x /remove-dst-root-ca-x3.sh \
   && /remove-dst-root-ca-x3.sh \
   && rm /remove-dst-root-ca-x3.sh
 
-RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C / \
+RUN tar xzfh /tmp/s6-overlay-amd64.tar.gz -C / \
   && rm -rf /tmp/s6-overlay-amd64.tar.gz
 
 RUN groupadd -r usr1cv8 --gid=2001 \

client/Dockerfile

@@ -2,7 +2,7 @@
 ARG DOCKER_REGISTRY_URL
 ARG BASE_IMAGE
 ARG BASE_TAG
-FROM ${DOCKER_REGISTRY_URL}/${BASE_IMAGE}:${BASE_TAG} as downloader
+FROM ${DOCKER_REGISTRY_URL}/${BASE_IMAGE}:${BASE_TAG} AS downloader
 
 # Копирование скрипта скачивания и локальных дистрибутивов
 COPY ./scripts/download_yard.sh /download.sh
@@ -34,7 +34,7 @@ ENV LC_ALL ru_RU.UTF-8
 RUN /download.sh "$ONEC_USERNAME" "$ONEC_PASSWORD" "$ONEC_VERSION" "client"
 
 # Начало основной стадии сборки
-FROM ubuntu:18.04 as base
+FROM ubuntu:18.04 AS base
 
 # Копируем скрипты и файлы установки
 ARG ONEC_VERSION

coverage41C/Dockerfile

@@ -4,7 +4,7 @@ ARG BASE_TAG
 ARG EDT_VERSION=2021.3
 ARG COVERAGE41C_VERSION=2.7.3
 
-FROM ${DOCKER_REGISTRY_URL}/edt:${EDT_VERSION} as base
+FROM ${DOCKER_REGISTRY_URL}/edt:${EDT_VERSION} AS base
 
 RUN ln -s $(find /opt/1C -name "com._1c.g5.v8.dt.debug.*.jar" -printf '%h\n'| sort -u) /opt/1C/edt_plugins
 

crs/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:latest as downloader
+FROM alpine:latest AS downloader
 
 ARG ONEC_USERNAME
 ARG ONEC_PASSWORD
@@ -24,7 +24,7 @@ RUN rm ./${downloads}/.gitkeep \
   && for file in ${downloads}/*.tar.gz; do tar -xzf "$file"; done \
   && rm -rf ${downloads}/*.*
 
-FROM i386/debian:bullseye-slim as base
+FROM i386/debian:bookworm-slim AS base
 
 ARG gosu_ver=1.11
 ARG ONEC_VERSION
@@ -51,7 +51,7 @@ ADD https://github.com/tianon/gosu/releases/download/$gosu_ver/gosu-i386 /bin/go
 
 RUN chmod +x /bin/gosu
 
-FROM i386/debian:bullseye-slim
+FROM i386/debian:bookworm-slim
 LABEL maintainer="Anton Kvashenkin <[email protected]> (@jugatsu)"
 
 ARG onec_uid="999"

edt/Dockerfile

@@ -7,7 +7,7 @@ ARG BASE_IMAGE=eclipse-temurin
 ARG BASE_TAG=11
 ARG DOCKER_REGISTRY_URL=library
 
-FROM ${DOWNLOADER_REGISTRY_URL}/${DOWNLOADER_IMAGE}:${DOWNLOADER_TAG} as downloader
+FROM ${DOWNLOADER_REGISTRY_URL}/${DOWNLOADER_IMAGE}:${DOWNLOADER_TAG} AS downloader
 
 # Копирование скрипта скачивания и локальных дистрибутивов
 COPY ./scripts/download_yard.sh /download.sh
@@ -38,7 +38,7 @@ ENV LC_ALL=ru_RU.UTF-8
 
 RUN /download.sh "$ONEC_USERNAME" "$ONEC_PASSWORD" "$EDT_VERSION" "edt"
 
-FROM ${BASE_IMAGE}:${BASE_TAG} as installer
+FROM ${BASE_IMAGE}:${BASE_TAG} AS installer
 
 LABEL maintainer="Nikita Gryzlov <[email protected]>, FirstBit"
 

gitsync/Dockerfile

@@ -1,6 +1,6 @@
 ARG DOCKER_REGISTRY_URL
 ARG ONEC_VERSION
-FROM ${DOCKER_REGISTRY_URL}/onec-client:${ONEC_VERSION} as base
+FROM ${DOCKER_REGISTRY_URL}/onec-client:${ONEC_VERSION} AS base
 
 FROM mono:5.20-slim
 LABEL maintainer="Anton Kvashenkin <[email protected]> (@jugatsu)"

jdk/Dockerfile

@@ -1,6 +1,6 @@
 ARG DOCKER_REGISTRY_URL=library
 ARG BASE_IMAGE=debian
-ARG BASE_TAG=bullseye-slim
+ARG BASE_TAG=bookworm-slim
 
 FROM ${DOCKER_REGISTRY_URL}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -19,11 +19,14 @@ RUN apt-get update \
       locales \
       software-properties-common \
       wget \
+  && update-ca-certificates \
   && mkdir -p /etc/apt/keyrings \
-  && wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc \
-  && echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list \
+  && echo "Acquire::https::packages.adoptium.net::Verify-Peer \"false\";" | tee /etc/apt/apt.conf.d/adoptium-no-check-cert \
+  && wget --no-check-certificate -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor -o /etc/apt/keyrings/adoptium.gpg \
+  && echo "deb [signed-by=/etc/apt/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list \
   && apt update \
   && apt install -y temurin-${OPENJDK_VERSION}-jdk \
+  && rm -f /etc/apt/apt.conf.d/adoptium-no-check-cert \
   && localedef -i ru_RU -c -f UTF-8 -A /usr/share/locale/locale.alias ru_RU.UTF-8
 
 # remove DST Root CA X3 cert if it exists

k8s-jenkins-agent/Dockerfile

@@ -4,7 +4,7 @@ ARG DOCKER_REGISTRY_URL
 ARG BASE_IMAGE
 ARG BASE_TAG
 
-FROM ${DOCKER_REGISTRY_URL}/${BASE_IMAGE}:${BASE_TAG} as agent
+FROM ${DOCKER_REGISTRY_URL}/${BASE_IMAGE}:${BASE_TAG} AS agent
 
 LABEL maintainer="Nikita Gryzlov <[email protected]>, FirstBit"
 

oscript/Dockerfile

@@ -1,6 +1,6 @@
 ARG DOCKER_REGISTRY_URL=library
 ARG BASE_IMAGE=debian
-ARG BASE_TAG=bullseye-slim
+ARG BASE_TAG=bookworm-slim
 
 FROM ${DOCKER_REGISTRY_URL}/${BASE_IMAGE}:${BASE_TAG}
 

server/Dockerfile

@@ -2,7 +2,7 @@
 ARG DOCKER_REGISTRY_URL
 ARG BASE_IMAGE
 ARG BASE_TAG
-FROM ${DOCKER_REGISTRY_URL}/${BASE_IMAGE}:${BASE_TAG} as downloader
+FROM ${DOCKER_REGISTRY_URL}/${BASE_IMAGE}:${BASE_TAG} AS downloader
 
 # Копирование скрипта скачивания и локальных дистрибутивов
 COPY ./scripts/download_yard.sh /download.sh
@@ -34,7 +34,7 @@ ENV LC_ALL ru_RU.UTF-8
 RUN /download.sh "$ONEC_USERNAME" "$ONEC_PASSWORD" "$ONEC_VERSION" "server"
 
 # Начало основной стадии сборки
-FROM ubuntu:20.04 as installer
+FROM ubuntu:20.04 AS installer
 
 # Копируем скрипты и файлы установки
 ARG ONEC_VERSION
@@ -79,7 +79,7 @@ ADD https://github.com/tianon/gosu/releases/download/$gosu_ver/gosu-amd64 /bin/g
 RUN chmod +x /bin/gosu
 
 # Переход к финальному образу
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 LABEL maintainer="ivanov egor"
 
 # Создание пользователя и установка локали

thin-client/Dockerfile

@@ -2,7 +2,7 @@
 ARG DOCKER_REGISTRY_URL
 ARG BASE_IMAGE
 ARG BASE_TAG
-FROM ${DOCKER_REGISTRY_URL}/${BASE_IMAGE}:${BASE_TAG} as downloader
+FROM ${DOCKER_REGISTRY_URL}/${BASE_IMAGE}:${BASE_TAG} AS downloader
 
 # Копирование скрипта скачивания и локальных дистрибутивов
 COPY ./scripts/download_yard.sh /download.sh
@@ -34,7 +34,7 @@ ENV LC_ALL ru_RU.UTF-8
 RUN /download.sh "$ONEC_USERNAME" "$ONEC_PASSWORD" "$ONEC_VERSION" "thin-client"
 
 # Начало основной стадии сборки
-FROM ubuntu:18.04 as base
+FROM ubuntu:18.04 AS base
 
 # Копируем скрипты и файлы установки
 ARG ONEC_VERSION