Skip to content

Commit

Permalink
Fix: not support Windows. add libsnmp in various Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
k402xxxcenxxx committed Aug 18, 2023
1 parent 3b06b2d commit 265dab6
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 27 deletions.
1 change: 1 addition & 0 deletions cmake/windows-setup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ if(FLB_WINDOWS_DEFAULTS)
# disable calyptia fleet management for now
set(FLB_IN_CALYPTIA_FLEET No)
set(FLB_IN_SPLUNK Yes)
set(FLB_IN_SNMP No)

# OUTPUT plugins
# ==============
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/
openssl \
htop atop strace iotop sysstat ncdu logrotate hdparm pciutils psmisc tree pv \
cmake make tar flex bison \
libssl-dev libsasl2-dev libsystemd-dev/bullseye-backports zlib1g-dev libpq-dev libyaml-dev postgresql-server-dev-all \
libssl-dev libsasl2-dev libsystemd-dev/bullseye-backports zlib1g-dev libpq-dev libyaml-dev libsnmp-dev postgresql-server-dev-all \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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 \
cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel && \
wget -q http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
rpm -ivh epel-release-latest-7.noarch.rpm && \
yum install -y cmake3
Expand Down
8 changes: 4 additions & 4 deletions packaging/distros/amazonlinux/Dockerfile
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 && \
cmake3 libyaml-devel libsnmp-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 && \
cmake3 libyaml-devel libsnmp-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 && \
cmake3 libyaml-devel libsnmp-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 && \
cmake3 libyaml-devel libsnmp-devel zlib-devel && \
yum clean all

# Common build for all distributions now
Expand Down
12 changes: 6 additions & 6 deletions packaging/distros/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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 \
cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel && \
wget -q http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
rpm -ivh epel-release-latest-7.noarch.rpm && \
yum install -y cmake3 && \
Expand All @@ -36,7 +36,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 \
cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel && \
wget -q http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
rpm -ivh epel-release-latest-7.noarch.rpm && \
yum install -y cmake3 && \
Expand Down Expand Up @@ -66,7 +66,7 @@ RUN yum -y update && \
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 \
libyaml-devel zlib-devel && \
libyaml-devel libsnmp-devel zlib-devel && \
yum clean all

ARG FLB_OUT_PGSQL=On
Expand All @@ -90,7 +90,7 @@ RUN yum -y update && \
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 \
libyaml-devel zlib-devel && \
libyaml-devel libsnmp-devel zlib-devel && \
yum clean all

ARG FLB_OUT_PGSQL=On
Expand All @@ -109,7 +109,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-
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 \
libyaml-devel zlib-devel && \
libyaml-devel libsnmp-devel zlib-devel && \
dnf clean all

ARG FLB_OUT_PGSQL=On
Expand All @@ -127,7 +127,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-
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 \
libyaml-devel zlib-devel && \
libyaml-devel libsnmp-devel zlib-devel && \
dnf clean all

ARG FLB_OUT_PGSQL=On
Expand Down
12 changes: 6 additions & 6 deletions packaging/distros/debian/Dockerfile
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 pkg-config && \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-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 pkg-config && \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-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 pkg-config && \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-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 pkg-config && \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-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 pkg-config && \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-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 pkg-config && \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-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
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 pkg-config && \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-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 pkg-config && \
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \
apt-get install -y --reinstall lsb-base lsb-release

# Common build for all distributions now
Expand Down
14 changes: 7 additions & 7 deletions packaging/distros/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,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 software-properties-common \
software-properties-common libyaml-dev apt-transport-https \
software-properties-common libyaml-dev libsnmp-dev apt-transport-https \
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 && \
Expand All @@ -39,7 +39,7 @@ RUN apt-get update && \
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 \
software-properties-common libyaml-dev apt-transport-https pkg-config zlib1g-dev && \
software-properties-common libyaml-dev libsnmp-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 && \
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \
Expand All @@ -61,7 +61,7 @@ RUN apt-get update && \
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 \
software-properties-common libyaml-dev apt-transport-https pkg-config zlib1g-dev && \
software-properties-common libyaml-dev libsnmp-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 && \
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \
Expand All @@ -79,7 +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 libyaml-dev pkg-config zlib1g-dev && \
libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libyaml-dev libsnmp-dev pkg-config zlib1g-dev && \
apt-get install -y --reinstall lsb-base lsb-release

# ubuntu/20.04.arm64v8 base image
Expand All @@ -93,7 +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 libyaml-dev pkg-config zlib1g-dev && \
libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libyaml-dev libsnmp-dev pkg-config zlib1g-dev && \
apt-get install -y --reinstall lsb-base lsb-release

# ubuntu/22.04 base image
Expand All @@ -105,7 +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 libyaml-dev pkg-config zlib1g-dev && \
libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev libsnmp-dev pkg-config zlib1g-dev && \
apt-get install -y --reinstall lsb-base lsb-release

# ubuntu/22.04.arm64v8 base image
Expand All @@ -119,7 +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 libyaml-dev pkg-config zlib1g-dev && \
libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev libsnmp-dev pkg-config zlib1g-dev && \
apt-get install -y --reinstall lsb-base lsb-release

# Common build for all distributions now
Expand Down

0 comments on commit 265dab6

Please sign in to comment.