diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index 0760061761..861f88a285 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -1,29 +1,23 @@ -FROM debian:buster +FROM php:7.4-cli-buster ARG DEBIAN_FRONTEND=noninteractive COPY tests/python/requirements.txt /tmp/ -RUN apt-get update && \ +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 && \ + 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 /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 - && \ - 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 \ + 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 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"