diff --git a/client-vnc/Dockerfile b/client-vnc/Dockerfile index 9c071ca..e0f709e 100644 --- a/client-vnc/Dockerfile +++ b/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,7 +69,7 @@ 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 @@ -76,7 +77,7 @@ 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 \ diff --git a/client/Dockerfile b/client/Dockerfile index de245d9..878ab61 100644 --- a/client/Dockerfile +++ b/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 diff --git a/coverage41C/Dockerfile b/coverage41C/Dockerfile index f55110f..b51133c 100644 --- a/coverage41C/Dockerfile +++ b/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 diff --git a/crs/Dockerfile b/crs/Dockerfile index a3dd823..e5f65fe 100644 --- a/crs/Dockerfile +++ b/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 (@jugatsu)" ARG onec_uid="999" diff --git a/edt/Dockerfile b/edt/Dockerfile index cf80961..14683b8 100644 --- a/edt/Dockerfile +++ b/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 , FirstBit" diff --git a/gitsync/Dockerfile b/gitsync/Dockerfile index d2348aa..311073d 100644 --- a/gitsync/Dockerfile +++ b/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 (@jugatsu)" diff --git a/jdk/Dockerfile b/jdk/Dockerfile index 37b7337..08dfa33 100644 --- a/jdk/Dockerfile +++ b/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 diff --git a/k8s-jenkins-agent/Dockerfile b/k8s-jenkins-agent/Dockerfile index 6a91a75..d89b3bd 100644 --- a/k8s-jenkins-agent/Dockerfile +++ b/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 , FirstBit" diff --git a/oscript/Dockerfile b/oscript/Dockerfile index df1ad49..b2459f8 100644 --- a/oscript/Dockerfile +++ b/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} diff --git a/server/Dockerfile b/server/Dockerfile index ebdaf89..df687cc 100644 --- a/server/Dockerfile +++ b/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" # Создание пользователя и установка локали diff --git a/thin-client/Dockerfile b/thin-client/Dockerfile index 9f7f56f..18893f5 100644 --- a/thin-client/Dockerfile +++ b/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