From 41630d3ad02d92f806f3b9f58ba71e6535186db8 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Mon, 22 Jun 2026 16:55:53 +0700 Subject: [PATCH 1/7] fix: building docker image for buster --- .github/workflows/Dockerfile.buster | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index 0760061761..0b58c5d4d0 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -3,24 +3,20 @@ ARG DEBIAN_FRONTEND=noninteractive COPY tests/python/requirements.txt /tmp/ -RUN apt-get update && \ - apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget lsb-release && \ +RUN echo "deb http://archive.debian.org/debian buster main" > /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian buster-updates main" >> /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian-security buster/updates main" >> /etc/apt/sources.list && \ echo "deb https://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list && \ - wget -qO /etc/apt/trusted.gpg.d/vkpartner.asc https://artifactory-external.vkpartner.ru/artifactory/api/gpg/key/public && \ - echo "deb https://artifactory-external.vkpartner.ru/artifactory/kphp buster main" >> /etc/apt/sources.list && \ - wget -qO - https://debian.octopuce.fr/snapshots/sury-php/buster-latest/apt.gpg | apt-key add - && \ + apt-get update && \ + apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget lsb-release && \ + wget -qO - https://debian.octopuce.fr/sury-php/apt.gpg | apt-key add - && \ echo "deb https://debian.octopuce.fr/snapshots/sury-php/buster-latest/ buster main" >> /etc/apt/sources.list && \ - TEMP_DEB="$(mktemp)" && \ - wget -O "$TEMP_DEB" 'https://dev.mysql.com/get/mysql-apt-config_0.8.29-1_all.deb' && \ - dpkg -i "$TEMP_DEB" && \ - rm -f "$TEMP_DEB" && \ echo "deb https://apt-archive.postgresql.org/pub/repos/apt buster-pgdg-archive main" > /etc/apt/sources.list.d/pgdg.list && \ wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 467B942D3A79BD29 && \ apt-get update && \ apt-get install -y --no-install-recommends \ git cmake-data=3.18* cmake=3.18* make g++ gperf netcat patch re2c \ - python3.7 python3-dev libpython3-dev python3-pip python3-setuptools python3-wheel mysql-server libmysqlclient-dev && \ + python3.7 python3-dev libpython3-dev python3-pip python3-setuptools python3-wheel default-mysql-server default-libmysqlclient-dev && \ pip3 install -r /tmp/requirements.txt && \ apt-get install -y --no-install-recommends libfmt-dev libgtest-dev libgmock-dev \ zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \ From ddb3e6be97108d8bc0cfc1825da3240ec6eaec00 Mon Sep 17 00:00:00 2001 From: Karim <43345462+Shamzik@users.noreply.github.com> Date: Thu, 25 Jun 2026 13:23:48 +0300 Subject: [PATCH 2/7] Update Dockerfile.buster --- .github/workflows/Dockerfile.buster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index 0b58c5d4d0..caf6edbc25 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -6,9 +6,9 @@ COPY tests/python/requirements.txt /tmp/ RUN echo "deb http://archive.debian.org/debian buster main" > /etc/apt/sources.list && \ echo "deb http://archive.debian.org/debian buster-updates main" >> /etc/apt/sources.list && \ echo "deb http://archive.debian.org/debian-security buster/updates main" >> /etc/apt/sources.list && \ - echo "deb https://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list && \ apt-get update && \ apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget lsb-release && \ + echo "deb https://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list && \ wget -qO - https://debian.octopuce.fr/sury-php/apt.gpg | apt-key add - && \ echo "deb https://debian.octopuce.fr/snapshots/sury-php/buster-latest/ buster main" >> /etc/apt/sources.list && \ echo "deb https://apt-archive.postgresql.org/pub/repos/apt buster-pgdg-archive main" > /etc/apt/sources.list.d/pgdg.list && \ From 488daeb826071b9dbfd3b50696506b8bcf29d182 Mon Sep 17 00:00:00 2001 From: Karim <43345462+Shamzik@users.noreply.github.com> Date: Thu, 25 Jun 2026 14:00:05 +0300 Subject: [PATCH 3/7] Update Dockerfile.buster --- .github/workflows/Dockerfile.buster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index caf6edbc25..06d39dd6af 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -9,7 +9,7 @@ RUN echo "deb http://archive.debian.org/debian buster main" > /etc/apt/sources.l apt-get update && \ apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget lsb-release && \ echo "deb https://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list && \ - wget -qO - https://debian.octopuce.fr/sury-php/apt.gpg | apt-key add - && \ + wget -qO - https://debian.octopuce.fr/sury-php/apt.gpg | tee /dev/stderr | apt-key add - && \ echo "deb https://debian.octopuce.fr/snapshots/sury-php/buster-latest/ buster main" >> /etc/apt/sources.list && \ echo "deb https://apt-archive.postgresql.org/pub/repos/apt buster-pgdg-archive main" > /etc/apt/sources.list.d/pgdg.list && \ wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ From 527691dde70a780de87a64acbcc8ff2b8c7eecb9 Mon Sep 17 00:00:00 2001 From: Karim <43345462+Shamzik@users.noreply.github.com> Date: Thu, 25 Jun 2026 15:44:57 +0300 Subject: [PATCH 4/7] Update Dockerfile.buster --- .github/workflows/Dockerfile.buster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index 06d39dd6af..06f5fc4ed6 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -9,7 +9,7 @@ RUN echo "deb http://archive.debian.org/debian buster main" > /etc/apt/sources.l apt-get update && \ apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget lsb-release && \ echo "deb https://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list && \ - wget -qO - https://debian.octopuce.fr/sury-php/apt.gpg | tee /dev/stderr | apt-key add - && \ + wget -qO - https://packages.sury.org/php/apt.gpg | apt-key add - && \ echo "deb https://debian.octopuce.fr/snapshots/sury-php/buster-latest/ buster main" >> /etc/apt/sources.list && \ echo "deb https://apt-archive.postgresql.org/pub/repos/apt buster-pgdg-archive main" > /etc/apt/sources.list.d/pgdg.list && \ wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ From a69aeb6fce8a4e2939e6dd6466ac4269c190c003 Mon Sep 17 00:00:00 2001 From: Karim Shamazov Date: Thu, 25 Jun 2026 16:27:03 +0300 Subject: [PATCH 5/7] remove unused include --- compiler/code-gen/files/init-scripts.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/compiler/code-gen/files/init-scripts.cpp b/compiler/code-gen/files/init-scripts.cpp index 0b7f9da4f7..682fe320f0 100644 --- a/compiler/code-gen/files/init-scripts.cpp +++ b/compiler/code-gen/files/init-scripts.cpp @@ -7,8 +7,6 @@ #include #include -#include - #include "compiler/code-gen/common.h" #include "compiler/code-gen/const-globals-batched-mem.h" #include "compiler/code-gen/declarations.h" From 80f5467f2ab2ad60cfd72de546db7123b17cdee7 Mon Sep 17 00:00:00 2001 From: Karim <43345462+Shamzik@users.noreply.github.com> Date: Thu, 25 Jun 2026 16:45:21 +0300 Subject: [PATCH 6/7] Update Dockerfile.buster --- .github/workflows/Dockerfile.buster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index 06f5fc4ed6..a46ffb5bf8 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -10,7 +10,7 @@ RUN echo "deb http://archive.debian.org/debian buster main" > /etc/apt/sources.l apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget lsb-release && \ echo "deb https://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list && \ wget -qO - https://packages.sury.org/php/apt.gpg | apt-key add - && \ - echo "deb https://debian.octopuce.fr/snapshots/sury-php/buster-latest/ buster main" >> /etc/apt/sources.list && \ + echo "deb https:/​/​apue.org/​mirror/​sury.org_php_buster/​ buster main" >> /etc/apt/sources.list && \ echo "deb https://apt-archive.postgresql.org/pub/repos/apt buster-pgdg-archive main" > /etc/apt/sources.list.d/pgdg.list && \ wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ apt-get update && \ From bf5ee690d8d79c17bc95c388cdaf62d75d562fb3 Mon Sep 17 00:00:00 2001 From: Karim <43345462+Shamzik@users.noreply.github.com> Date: Thu, 25 Jun 2026 22:15:23 +0300 Subject: [PATCH 7/7] try php:7.4-cli-buster --- .github/workflows/Dockerfile.buster | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index a46ffb5bf8..861f88a285 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -1,4 +1,4 @@ -FROM debian:buster +FROM php:7.4-cli-buster ARG DEBIAN_FRONTEND=noninteractive COPY tests/python/requirements.txt /tmp/ @@ -9,8 +9,6 @@ RUN echo "deb http://archive.debian.org/debian buster main" > /etc/apt/sources.l apt-get update && \ apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget lsb-release && \ echo "deb https://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list && \ - wget -qO - https://packages.sury.org/php/apt.gpg | apt-key add - && \ - echo "deb https:/​/​apue.org/​mirror/​sury.org_php_buster/​ buster main" >> /etc/apt/sources.list && \ echo "deb https://apt-archive.postgresql.org/pub/repos/apt buster-pgdg-archive main" > /etc/apt/sources.list.d/pgdg.list && \ wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ apt-get update && \ @@ -19,7 +17,7 @@ RUN echo "deb http://archive.debian.org/debian buster main" > /etc/apt/sources.l python3.7 python3-dev libpython3-dev python3-pip python3-setuptools python3-wheel default-mysql-server default-libmysqlclient-dev && \ pip3 install -r /tmp/requirements.txt && \ apt-get install -y --no-install-recommends libfmt-dev libgtest-dev libgmock-dev \ - zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \ + zlib1g-dev libldap-dev libkrb5-dev \ libpq5=14.* postgresql-14 postgresql-server-dev-14 libpq-dev=14.* composer && \ rm -rf /var/lib/apt/lists/* && \ update-alternatives --set php /usr/bin/php7.4