Skip to content

Commit 9a4ed5a

Browse files
committed
Fix: not support Windows. add libsnmp in various Dockerfile
Signed-off-by: k402xxxcenxxx <[email protected]>
1 parent 33f3555 commit 9a4ed5a

File tree

7 files changed

+29
-27
lines changed

7 files changed

+29
-27
lines changed

cmake/windows-setup.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ if(FLB_WINDOWS_DEFAULTS)
5757
set(FLB_IN_ELASTICSEARCH Yes)
5858
set(FLB_IN_SPLUNK Yes)
5959
set(FLB_IN_PROMETHEUS_REMOTE_WRITE Yes)
60+
set(FLB_IN_SNMP No)
6061

6162
# OUTPUT plugins
6263
# ==============

dockerfiles/Dockerfile.centos7

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\
1010
yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \
1111
wget unzip systemd-devel wget flex bison \
1212
cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \
13-
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \
13+
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel && \
1414
yum install -y epel-release && \
1515
yum install -y cmake3
1616

packaging/distros/amazonlinux/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN yum -y update && \
1818
wget unzip systemd-devel wget flex bison \
1919
cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \
2020
postgresql-devel postgresql-libs \
21-
cmake3 libyaml-devel zlib-devel && \
21+
cmake3 libyaml-devel libsnmp-devel zlib-devel && \
2222
yum clean all
2323

2424
# amazonlinux/2.arm64v8 base image
@@ -32,7 +32,7 @@ RUN yum -y update && \
3232
wget unzip systemd-devel wget flex bison \
3333
cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \
3434
postgresql-devel postgresql-libs \
35-
cmake3 libyaml-devel zlib-devel && \
35+
cmake3 libyaml-devel libsnmp-devel zlib-devel && \
3636
yum clean all
3737

3838
FROM amazonlinux:2023 as amazonlinux-2023-base
@@ -43,7 +43,7 @@ RUN yum -y update && \
4343
wget unzip systemd-devel wget flex bison \
4444
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
4545
postgresql-devel postgresql-libs \
46-
cmake3 libyaml-devel zlib-devel && \
46+
cmake3 libyaml-devel libsnmp-devel zlib-devel && \
4747
yum clean all
4848

4949
# hadolint ignore=DL3029
@@ -57,7 +57,7 @@ RUN yum -y update && \
5757
wget unzip systemd-devel wget flex bison \
5858
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
5959
postgresql-devel postgresql-libs \
60-
cmake3 libyaml-devel zlib-devel && \
60+
cmake3 libyaml-devel libsnmp-devel zlib-devel && \
6161
yum clean all
6262

6363
# Common build for all distributions now

packaging/distros/centos/Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\
1919
yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \
2020
wget unzip systemd-devel wget flex bison \
2121
cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \
22-
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \
22+
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel && \
2323
yum install -y epel-release && \
2424
yum install -y cmake3 && \
2525
yum clean all
@@ -39,8 +39,9 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\
3939
yum install -y rpm-build curl ca-certificates gcc gcc-c++ cmake make bash \
4040
wget unzip systemd-devel wget flex bison \
4141
cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \
42-
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \
43-
yum install -y epel-release && \
42+
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel && \
43+
wget -q http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
44+
rpm -ivh epel-release-latest-7.noarch.rpm && \
4445
yum install -y cmake3 && \
4546
yum clean all
4647

@@ -68,7 +69,7 @@ RUN yum -y update && \
6869
wget unzip systemd-devel wget flex bison \
6970
postgresql-libs postgresql-devel postgresql-server postgresql \
7071
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
71-
libyaml-devel zlib-devel && \
72+
libyaml-devel libsnmp-devel zlib-devel && \
7273
yum clean all
7374

7475
ARG FLB_OUT_PGSQL=On
@@ -92,7 +93,7 @@ RUN yum -y update && \
9293
wget unzip systemd-devel wget flex bison \
9394
postgresql-libs postgresql-devel postgresql-server postgresql \
9495
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
95-
libyaml-devel zlib-devel && \
96+
libyaml-devel libsnmp-devel zlib-devel && \
9697
yum clean all
9798

9899
ARG FLB_OUT_PGSQL=On
@@ -111,7 +112,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-
111112
wget unzip systemd-devel wget flex bison \
112113
postgresql-libs postgresql-devel postgresql-server postgresql \
113114
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
114-
libyaml-devel zlib-devel && \
115+
libyaml-devel libsnmp-devel zlib-devel && \
115116
dnf clean all
116117

117118
ARG FLB_OUT_PGSQL=On
@@ -129,7 +130,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-
129130
wget unzip systemd-devel wget flex bison \
130131
postgresql-libs postgresql-devel postgresql-server postgresql \
131132
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
132-
libyaml-devel zlib-devel && \
133+
libyaml-devel libsnmp-devel zlib-devel && \
133134
dnf clean all
134135

135136
ARG FLB_OUT_PGSQL=On

packaging/distros/debian/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN apt-get -qq update && \
1919
cmake make bash sudo wget unzip dh-make \
2020
libsystemd-dev zlib1g-dev flex bison \
2121
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
22-
libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \
22+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \
2323
apt-get install -y --reinstall lsb-base lsb-release
2424

2525
# debian/buster.arm64v8 base image
@@ -34,7 +34,7 @@ RUN apt-get -qq update && \
3434
cmake make bash sudo wget unzip dh-make \
3535
libsystemd-dev zlib1g-dev flex bison \
3636
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
37-
libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \
37+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \
3838
apt-get install -y --reinstall lsb-base lsb-release
3939

4040
# debian/bullseye base image
@@ -47,7 +47,7 @@ RUN apt-get -qq update && \
4747
cmake make bash sudo wget unzip dh-make \
4848
libsystemd-dev zlib1g-dev flex bison \
4949
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
50-
libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \
50+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \
5151
apt-get install -y --reinstall lsb-base lsb-release
5252

5353
# debian/bullseye.arm64v8 base image
@@ -62,7 +62,7 @@ RUN apt-get -qq update && \
6262
cmake make bash sudo wget unzip dh-make \
6363
libsystemd-dev zlib1g-dev flex bison \
6464
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
65-
libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \
65+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \
6666
apt-get install -y --reinstall lsb-base lsb-release
6767

6868
# debian/bookworm base image
@@ -75,7 +75,7 @@ RUN apt-get -qq update && \
7575
cmake make bash sudo wget unzip dh-make \
7676
libsystemd-dev zlib1g-dev flex bison \
7777
libssl3 libssl-dev libpq-dev postgresql-server-dev-all \
78-
libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \
78+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \
7979
apt-get install -y --reinstall lsb-base lsb-release
8080

8181
# debian/bookworm.arm64v8 base image
@@ -90,7 +90,7 @@ RUN apt-get -qq update && \
9090
cmake make bash sudo wget unzip dh-make \
9191
libsystemd-dev zlib1g-dev flex bison \
9292
libssl3 libssl-dev libpq-dev postgresql-server-dev-all \
93-
libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \
93+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \
9494
apt-get install -y --reinstall lsb-base lsb-release
9595

9696
# Common build for all distributions now

packaging/distros/raspbian/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN apt-get update && \
1818
make bash sudo wget unzip dh-make \
1919
libsystemd-dev zlib1g-dev flex bison \
2020
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
21-
libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \
21+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \
2222
apt-get install -y --reinstall lsb-base lsb-release
2323

2424
# raspbian/bullseye base image
@@ -31,7 +31,7 @@ RUN apt-get update && \
3131
cmake make bash sudo wget unzip dh-make \
3232
libsystemd-dev zlib1g-dev flex bison \
3333
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
34-
libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \
34+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev pkg-config && \
3535
apt-get install -y --reinstall lsb-base lsb-release
3636

3737
# Common build for all distributions now

packaging/distros/ubuntu/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN apt-get update && \
2020
apt-get install -y curl ca-certificates build-essential libsystemd-dev cmake \
2121
make bash wget unzip nano vim valgrind dh-make flex bison \
2222
libpq-dev postgresql-server-dev-all software-properties-common \
23-
software-properties-common libyaml-dev apt-transport-https \
23+
software-properties-common libyaml-dev libsnmp-dev apt-transport-https \
2424
pkg-config libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.0 zlib1g-dev && \
2525
wget -q -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
2626
gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
@@ -39,7 +39,7 @@ RUN apt-get update && \
3939
cmake make bash wget unzip nano vim valgrind dh-make flex bison \
4040
libpq-dev postgresql-server-dev-all \
4141
libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 \
42-
software-properties-common libyaml-dev apt-transport-https pkg-config zlib1g-dev && \
42+
software-properties-common libyaml-dev libsnmp-dev apt-transport-https pkg-config zlib1g-dev && \
4343
wget -q -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
4444
gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
4545
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \
@@ -61,7 +61,7 @@ RUN apt-get update && \
6161
cmake make bash wget unzip nano vim valgrind dh-make flex bison \
6262
libpq-dev postgresql-server-dev-all \
6363
libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 \
64-
software-properties-common libyaml-dev apt-transport-https pkg-config zlib1g-dev && \
64+
software-properties-common libyaml-dev libsnmp-dev apt-transport-https pkg-config zlib1g-dev && \
6565
wget -q -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
6666
gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
6767
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \
@@ -79,7 +79,7 @@ RUN apt-get update && \
7979
apt-get install -y curl ca-certificates build-essential libsystemd-dev \
8080
cmake make bash wget unzip nano vim valgrind dh-make flex bison \
8181
libpq-dev postgresql-server-dev-all \
82-
libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libyaml-dev pkg-config zlib1g-dev && \
82+
libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libyaml-dev libsnmp-dev pkg-config zlib1g-dev && \
8383
apt-get install -y --reinstall lsb-base lsb-release
8484

8585
# ubuntu/20.04.arm64v8 base image
@@ -93,7 +93,7 @@ RUN apt-get update && \
9393
apt-get install -y curl ca-certificates build-essential libsystemd-dev \
9494
cmake make bash wget unzip nano vim valgrind dh-make flex bison \
9595
libpq-dev postgresql-server-dev-all \
96-
libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libyaml-dev pkg-config zlib1g-dev && \
96+
libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libyaml-dev libsnmp-dev pkg-config zlib1g-dev && \
9797
apt-get install -y --reinstall lsb-base lsb-release
9898

9999
# ubuntu/22.04 base image
@@ -105,7 +105,7 @@ RUN apt-get update && \
105105
apt-get install -y curl ca-certificates build-essential libsystemd-dev \
106106
cmake make bash wget unzip nano vim valgrind dh-make flex bison \
107107
libpq-dev postgresql-server-dev-all libpq5 \
108-
libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev pkg-config zlib1g-dev && \
108+
libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev libsnmp-dev pkg-config zlib1g-dev && \
109109
apt-get install -y --reinstall lsb-base lsb-release
110110

111111
# ubuntu/22.04.arm64v8 base image
@@ -119,7 +119,7 @@ RUN apt-get update && \
119119
apt-get install -y curl ca-certificates build-essential libsystemd-dev \
120120
cmake make bash wget unzip nano vim valgrind dh-make flex bison \
121121
libpq-dev postgresql-server-dev-all libpq5 \
122-
libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev pkg-config zlib1g-dev && \
122+
libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev libsnmp-dev pkg-config zlib1g-dev && \
123123
apt-get install -y --reinstall lsb-base lsb-release
124124

125125
# ubuntu/24.04 base image

0 commit comments

Comments
 (0)