Skip to content

Revert "package: distro: dockerfiles: Install libcurl development package for oauthoicd on rdkafka [Backport 3.2]" #9873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
celalettin1286 wants to merge 8 commits into from
Closed

Revert "package: distro: dockerfiles: Install libcurl development package for oauthoicd on rdkafka [Backport 3.2]" #9873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b0d7026
Revert "dockerfile: Fix library dependencies"
celalettin1286 Jan 27, 2025
94830a7
Revert "dockefiles: centos7: Add libcurl4 development package depende…
celalettin1286 Jan 27, 2025
948d8ae
Revert "dockerfiles: Add libcurl4 dependency for OAuth/OICD feature o…
celalettin1286 Jan 27, 2025
879cc0f
Revert "ubuntu: Install libcurl4-openssl-dev for oauth on rdkafka"
celalettin1286 Jan 27, 2025
6832ded
Revert "raspbian: Install libcurl4-openssl-dev for oauth on rdkafka"
celalettin1286 Jan 27, 2025
2a75ad7
Revert "debian: Install libcurl4-openssl-dev for oauth on rdkafka"
celalettin1286 Jan 27, 2025
aa0d464
Revert "centos: Install libcurl for oauth on rdkafka"
celalettin1286 Jan 27, 2025
7cc28a7
Revert "amazonlinux: Install development package of libcurl"
celalettin1286 Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.centos7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions packaging/distros/amazonlinux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions packaging/distros/centos/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -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 && \
Expand Down Expand Up @@ -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

Expand 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

Expand 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

Expand 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

Expand Down
12 changes: 6 additions & 6 deletions packaging/distros/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packaging/distros/raspbian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
25 changes: 9 additions & 16 deletions packaging/distros/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' && \
Expand All @@ -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 && \
Expand All @@ -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 && \
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading