diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 5d3d49f23bf..c6ad9060347 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -46,7 +46,6 @@ RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/ make \ tar \ libssl-dev \ - libcurl4-openssl-dev \ libsasl2-dev \ pkg-config \ libsystemd-dev/bookworm-backports \ @@ -112,12 +111,6 @@ RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/ apt-get update && \ apt-get download \ libssl3 \ - libcurl4 \ - libnghttp2-14 \ - librtmp1 \ - libssh2-1 \ - libpsl5 \ - libbrotli1 \ libsasl2-2 \ pkg-config \ libpq5 \ @@ -219,12 +212,6 @@ RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/ apt-get update && \ apt-get install -y --no-install-recommends \ libssl3 \ - libcurl4 \ - libnghttp2-14 \ - librtmp1 \ - libssh2-1 \ - libpsl5 \ - libbrotli1 \ libsasl2-2 \ pkg-config \ libpq5 \ diff --git a/dockerfiles/Dockerfile.centos7 b/dockerfiles/Dockerfile.centos7 index 384079441a6..9ff9ee88ad9 100644 --- a/dockerfiles/Dockerfile.centos7 +++ b/dockerfiles/Dockerfile.centos7 @@ -9,7 +9,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\ yum -y update && \ yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \ wget unzip systemd-devel wget flex bison \ - cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel libcurl-devel \ + cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ yum install -y epel-release && \ yum install -y cmake3 diff --git a/packaging/distros/amazonlinux/Dockerfile b/packaging/distros/amazonlinux/Dockerfile index 9f3a209f9e2..fa9b17c5bd7 100644 --- a/packaging/distros/amazonlinux/Dockerfile +++ b/packaging/distros/amazonlinux/Dockerfile @@ -18,7 +18,7 @@ RUN yum -y update && \ wget unzip systemd-devel wget flex bison \ cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ postgresql-devel postgresql-libs \ - cmake3 libyaml-devel zlib-devel libcurl-devel && \ + cmake3 libyaml-devel zlib-devel && \ yum clean all # amazonlinux/2.arm64v8 base image @@ -32,7 +32,7 @@ RUN yum -y update && \ wget unzip systemd-devel wget flex bison \ cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ postgresql-devel postgresql-libs \ - cmake3 libyaml-devel zlib-devel libcurl-devel && \ + cmake3 libyaml-devel zlib-devel && \ yum clean all FROM amazonlinux:2023 as amazonlinux-2023-base @@ -43,7 +43,7 @@ RUN yum -y update && \ wget unzip systemd-devel wget flex bison \ cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ postgresql-devel postgresql-libs \ - cmake3 libyaml-devel zlib-devel libcurl-devel && \ + cmake3 libyaml-devel zlib-devel && \ yum clean all # hadolint ignore=DL3029 @@ -57,7 +57,7 @@ RUN yum -y update && \ wget unzip systemd-devel wget flex bison \ cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ postgresql-devel postgresql-libs \ - cmake3 libyaml-devel zlib-devel libcurl-devel && \ + cmake3 libyaml-devel zlib-devel && \ yum clean all # Common build for all distributions now diff --git a/packaging/distros/centos/Dockerfile b/packaging/distros/centos/Dockerfile index 39f7c65e650..8e70b32d478 100644 --- a/packaging/distros/centos/Dockerfile +++ b/packaging/distros/centos/Dockerfile @@ -18,7 +18,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\ yum -y update && \ yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \ wget unzip systemd-devel wget flex bison \ - cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel libcurl-devel \ + cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ yum install -y epel-release && \ yum install -y cmake3 && \ @@ -38,7 +38,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\ yum -y update && \ yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \ wget unzip systemd-devel wget flex bison \ - cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel libcurl-devel \ + cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \ postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \ yum install -y epel-release && \ yum install -y cmake3 && \ @@ -67,7 +67,7 @@ RUN yum -y update && \ yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \ wget unzip systemd-devel wget flex bison \ postgresql-libs postgresql-devel postgresql-server postgresql \ - cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel \ + cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ libyaml-devel zlib-devel && \ yum clean all @@ -91,7 +91,7 @@ RUN yum -y update && \ yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \ wget unzip systemd-devel wget flex bison \ postgresql-libs postgresql-devel postgresql-server postgresql \ - cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel \ + cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ libyaml-devel zlib-devel && \ yum clean all @@ -110,7 +110,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set- dnf -y install rpm-build ca-certificates gcc gcc-c++ cmake make bash \ wget unzip systemd-devel wget flex bison \ postgresql-libs postgresql-devel postgresql-server postgresql \ - cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel \ + cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ libyaml-devel zlib-devel && \ dnf clean all @@ -128,7 +128,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set- dnf -y install rpm-build ca-certificates gcc gcc-c++ cmake make bash \ wget unzip systemd-devel wget flex bison \ postgresql-libs postgresql-devel postgresql-server postgresql \ - cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel \ + cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \ libyaml-devel zlib-devel && \ dnf clean all diff --git a/packaging/distros/debian/Dockerfile b/packaging/distros/debian/Dockerfile index 2aa835642cb..d37871501cc 100644 --- a/packaging/distros/debian/Dockerfile +++ b/packaging/distros/debian/Dockerfile @@ -19,7 +19,7 @@ RUN apt-get -qq update && \ cmake make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # debian/buster.arm64v8 base image @@ -34,7 +34,7 @@ RUN apt-get -qq update && \ cmake make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # debian/bullseye base image @@ -47,7 +47,7 @@ RUN apt-get -qq update && \ cmake make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # debian/bullseye.arm64v8 base image @@ -62,7 +62,7 @@ RUN apt-get -qq update && \ cmake make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # debian/bookworm base image @@ -75,7 +75,7 @@ RUN apt-get -qq update && \ cmake make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl3 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # debian/bookworm.arm64v8 base image @@ -90,7 +90,7 @@ RUN apt-get -qq update && \ cmake make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl3 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # Common build for all distributions now diff --git a/packaging/distros/raspbian/Dockerfile b/packaging/distros/raspbian/Dockerfile index 2d266da8a73..03ca9708772 100644 --- a/packaging/distros/raspbian/Dockerfile +++ b/packaging/distros/raspbian/Dockerfile @@ -18,7 +18,7 @@ RUN apt-get update && \ make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # raspbian/bullseye base image @@ -31,7 +31,7 @@ RUN apt-get update && \ cmake make bash sudo wget unzip dh-make \ libsystemd-dev zlib1g-dev flex bison \ libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config && \ + libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release # Common build for all distributions now diff --git a/packaging/distros/ubuntu/Dockerfile b/packaging/distros/ubuntu/Dockerfile index 3f59ef48d79..2ca0704580e 100644 --- a/packaging/distros/ubuntu/Dockerfile +++ b/packaging/distros/ubuntu/Dockerfile @@ -21,8 +21,7 @@ RUN apt-get update && \ make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all software-properties-common \ software-properties-common libyaml-dev apt-transport-https \ - pkg-config libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.0 \ - libcurl4-openssl-dev zlib1g-dev && \ + pkg-config libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.0 zlib1g-dev && \ wget -q -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \ gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main' && \ @@ -39,7 +38,7 @@ RUN apt-get update && \ apt-get install -y curl ca-certificates gcc-8 g++-8 libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libcurl4-openssl-dev \ + libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 \ software-properties-common libyaml-dev apt-transport-https pkg-config zlib1g-dev && \ wget -q -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \ gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ @@ -61,7 +60,7 @@ RUN apt-get update && \ apt-get install -y curl ca-certificates gcc-8 g++-8 libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libcurl4-openssl-dev \ + libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 \ software-properties-common libyaml-dev apt-transport-https pkg-config zlib1g-dev && \ wget -q -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \ gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ @@ -80,8 +79,7 @@ RUN apt-get update && \ apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libcurl4-openssl-dev \ - libyaml-dev pkg-config zlib1g-dev && \ + libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libyaml-dev pkg-config zlib1g-dev && \ apt-get install -y --reinstall lsb-base lsb-release # ubuntu/20.04.arm64v8 base image @@ -95,8 +93,7 @@ RUN apt-get update && \ apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all \ - libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libcurl4-openssl-dev \ - libyaml-dev pkg-config zlib1g-dev && \ + libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libyaml-dev pkg-config zlib1g-dev && \ apt-get install -y --reinstall lsb-base lsb-release # ubuntu/22.04 base image @@ -108,8 +105,7 @@ RUN apt-get update && \ apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all libpq5 \ - libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libcurl4-openssl-dev \ - libyaml-dev pkg-config zlib1g-dev && \ + libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev pkg-config zlib1g-dev && \ apt-get install -y --reinstall lsb-base lsb-release # ubuntu/22.04.arm64v8 base image @@ -123,8 +119,7 @@ RUN apt-get update && \ apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all libpq5 \ - libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libcurl4-openssl-dev \ - libyaml-dev pkg-config zlib1g-dev && \ + libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev pkg-config zlib1g-dev && \ apt-get install -y --reinstall lsb-base lsb-release # ubuntu/24.04 base image @@ -136,8 +131,7 @@ RUN apt-get update && \ apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all libpq5 \ - libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libcurl4-openssl-dev \ - libyaml-dev pkg-config zlib1g-dev && \ + libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev pkg-config zlib1g-dev && \ apt-get install -y --reinstall lsb-base lsb-release # ubuntu/24.04.arm64v8 base image @@ -151,8 +145,7 @@ RUN apt-get update && \ apt-get install -y curl ca-certificates build-essential libsystemd-dev \ cmake make bash wget unzip nano vim valgrind dh-make flex bison \ libpq-dev postgresql-server-dev-all libpq5 \ - libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libcurl4-openssl-dev \ - libyaml-dev pkg-config zlib1g-dev && \ + libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev pkg-config zlib1g-dev && \ apt-get install -y --reinstall lsb-base lsb-release # Common build for all distributions now