Skip to content

Commit 98a6aea

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

File tree

7 files changed

+34
-33
lines changed

7 files changed

+34
-33
lines changed

‎cmake/windows-setup.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ if(FLB_WINDOWS_DEFAULTS)
8181
set(FLB_IN_ELASTICSEARCH Yes)
8282
set(FLB_IN_SPLUNK Yes)
8383
set(FLB_IN_PROMETHEUS_REMOTE_WRITE Yes)
84+
set(FLB_IN_SNMP No)
8485

8586
# OUTPUT plugins
8687
# ==============

‎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++ make bash \
1111
wget unzip systemd-devel flex bison \
1212
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel \
13-
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel \
13+
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel \
1414
tar gzip
1515

1616
ENV CMAKE_HOME="/opt/cmake"

‎packaging/distros/amazonlinux/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN yum -y update && \
2323
wget unzip systemd-devel wget flex bison \
2424
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
2525
postgresql-devel postgresql-libs glibc-devel \
26-
libyaml-devel zlib-devel libcurl-devel pkgconf-pkg-config \
26+
libyaml-devel libsnmp-devel zlib-devel libcurl-devel pkgconf-pkg-config \
2727
tar gzip && \
2828
yum clean all && \
2929
mkdir -p "${CMAKE_HOME}" && \
@@ -48,7 +48,7 @@ RUN yum -y update && \
4848
wget unzip systemd-devel wget flex bison \
4949
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
5050
postgresql-devel postgresql-libs \
51-
libyaml-devel zlib-devel libcurl-devel pkgconf-pkg-config \
51+
libyaml-devel libsnmp-devel zlib-devel libcurl-devel pkgconf-pkg-config \
5252
tar gzip && \
5353
yum clean all && \
5454
mkdir -p "${CMAKE_HOME}" && \
@@ -73,7 +73,7 @@ RUN yum -y update && \
7373
wget unzip systemd-devel wget flex bison \
7474
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
7575
postgresql-devel postgresql-libs \
76-
libyaml-devel zlib-devel libcurl-devel pkgconf-pkg-config \
76+
libyaml-devel libsnmp-devel zlib-devel libcurl-devel pkgconf-pkg-config \
7777
tar gzip && \
7878
yum clean all && \
7979
mkdir -p "${CMAKE_HOME}" && \
@@ -100,7 +100,7 @@ RUN yum -y update && \
100100
wget unzip systemd-devel wget flex bison \
101101
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
102102
postgresql-devel postgresql-libs \
103-
libyaml-devel zlib-devel libcurl-devel pkgconf-pkg-config \
103+
libyaml-devel libsnmp-devel zlib-devel libcurl-devel pkgconf-pkg-config \
104104
tar gzip && \
105105
yum clean all && \
106106
mkdir -p "${CMAKE_HOME}" && \

‎packaging/distros/centos/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\
2323
yum install -y rpm-build curl ca-certificates gcc gcc-c++ make bash \
2424
wget unzip systemd-devel wget flex bison \
2525
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
26-
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel \
26+
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel \
2727
tar gzip && \
2828
yum install -y epel-release && \
2929
yum install -y cmake3 && \
@@ -58,7 +58,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\
5858
yum install -y rpm-build curl ca-certificates gcc gcc-c++ make bash \
5959
wget unzip systemd-devel wget flex bison \
6060
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
61-
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel \
61+
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel libsnmp-devel \
6262
tar gzip && \
6363
yum install -y epel-release && \
6464
yum install -y cmake3 && \
@@ -102,7 +102,7 @@ RUN yum -y update && \
102102
wget unzip systemd-devel wget flex bison \
103103
postgresql-libs postgresql-devel postgresql-server postgresql \
104104
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
105-
libyaml-devel zlib-devel \
105+
libyaml-devel libsnmp-devel zlib-devel \
106106
tar gzip && \
107107
yum clean all && \
108108
mkdir -p "${CMAKE_HOME}" && \
@@ -141,7 +141,7 @@ RUN yum -y update && \
141141
wget unzip systemd-devel wget flex bison \
142142
postgresql-libs postgresql-devel postgresql-server postgresql \
143143
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
144-
libyaml-devel zlib-devel \
144+
libyaml-devel libsnmp-devel zlib-devel \
145145
tar gzip && \
146146
yum clean all && \
147147
mkdir -p "${CMAKE_HOME}" && \
@@ -175,7 +175,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-
175175
wget unzip systemd-devel wget flex bison \
176176
postgresql-libs postgresql-devel postgresql-server postgresql \
177177
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
178-
libyaml-devel zlib-devel \
178+
libyaml-devel libsnmp-devel zlib-devel \
179179
tar gzip && \
180180
dnf clean all && \
181181
mkdir -p "${CMAKE_HOME}" && \
@@ -204,7 +204,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-
204204
wget unzip systemd-devel wget flex bison \
205205
postgresql-libs postgresql-devel postgresql-server postgresql \
206206
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
207-
libyaml-devel zlib-devel \
207+
libyaml-devel libsnmp-devel zlib-devel \
208208
tar gzip && \
209209
dnf clean all && \
210210
mkdir -p "${CMAKE_HOME}" && \
@@ -238,7 +238,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-
238238
wget unzip systemd-devel wget flex bison \
239239
postgresql-libs postgresql-devel postgresql-server postgresql \
240240
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
241-
libyaml-devel zlib-devel \
241+
libyaml-devel libsnmp-devel zlib-devel \
242242
tar gzip && \
243243
dnf clean all && \
244244
mkdir -p "${CMAKE_HOME}" && \
@@ -267,7 +267,7 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-
267267
wget unzip systemd-devel wget flex bison \
268268
postgresql-libs postgresql-devel postgresql-server postgresql \
269269
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel libcurl-devel pkgconf-pkg-config \
270-
libyaml-devel zlib-devel \
270+
libyaml-devel libsnmp-devel zlib-devel \
271271
tar gzip && \
272272
dnf clean all && \
273273
mkdir -p "${CMAKE_HOME}" && \

‎packaging/distros/debian/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN apt-get -qq update && \
2828
make bash sudo wget unzip dh-make \
2929
libsystemd-dev zlib1g-dev flex bison \
3030
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
31-
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
31+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
3232
tar gzip && \
3333
apt-get install -y --reinstall lsb-base lsb-release && \
3434
mkdir -p "${CMAKE_HOME}" && \
@@ -59,7 +59,7 @@ RUN apt-get -qq update && \
5959
make bash sudo wget unzip dh-make \
6060
libsystemd-dev zlib1g-dev flex bison \
6161
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
62-
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
62+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
6363
tar gzip && \
6464
apt-get install -y --reinstall lsb-base lsb-release && \
6565
mkdir -p "${CMAKE_HOME}" && \
@@ -83,7 +83,7 @@ RUN apt-get -qq update && \
8383
make bash sudo wget unzip dh-make \
8484
libsystemd-dev zlib1g-dev flex bison \
8585
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
86-
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
86+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
8787
tar gzip && \
8888
apt-get install -y --reinstall lsb-base lsb-release && \
8989
mkdir -p "${CMAKE_HOME}" && \
@@ -109,7 +109,7 @@ RUN apt-get -qq update && \
109109
make bash sudo wget unzip dh-make \
110110
libsystemd-dev zlib1g-dev flex bison \
111111
libssl1.1 libssl-dev libpq-dev postgresql-server-dev-all \
112-
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
112+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
113113
tar gzip && \
114114
apt-get install -y --reinstall lsb-base lsb-release && \
115115
mkdir -p "${CMAKE_HOME}" && \
@@ -133,7 +133,7 @@ RUN apt-get -qq update && \
133133
make bash sudo wget unzip dh-make \
134134
libsystemd-dev zlib1g-dev flex bison \
135135
libssl3 libssl-dev libpq-dev postgresql-server-dev-all \
136-
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
136+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
137137
tar gzip && \
138138
apt-get install -y --reinstall lsb-base lsb-release && \
139139
mkdir -p "${CMAKE_HOME}" && \
@@ -159,7 +159,7 @@ RUN apt-get -qq update && \
159159
make bash sudo wget unzip dh-make \
160160
libsystemd-dev zlib1g-dev flex bison \
161161
libssl3 libssl-dev libpq-dev postgresql-server-dev-all \
162-
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
162+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
163163
tar gzip && \
164164
apt-get install -y --reinstall lsb-base lsb-release && \
165165
mkdir -p "${CMAKE_HOME}" && \
@@ -183,7 +183,7 @@ RUN apt-get -qq update && \
183183
make bash sudo wget unzip dh-make \
184184
libsystemd-dev zlib1g-dev flex bison \
185185
libssl3 libssl-dev libpq-dev postgresql-server-dev-all \
186-
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
186+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
187187
tar gzip && \
188188
apt-get install -y --reinstall lsb-base lsb-release && \
189189
mkdir -p "${CMAKE_HOME}" && \
@@ -209,7 +209,7 @@ RUN apt-get -qq update && \
209209
make bash sudo wget unzip dh-make \
210210
libsystemd-dev zlib1g-dev flex bison \
211211
libssl3 libssl-dev libpq-dev postgresql-server-dev-all \
212-
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config \
212+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config \
213213
tar gzip && \
214214
apt-get install -y --reinstall lsb-base lsb-release && \
215215
mkdir -p "${CMAKE_HOME}" && \

‎packaging/distros/raspbian/Dockerfile‎

Lines changed: 3 additions & 3 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 libcurl4-openssl-dev pkg-config && \
21+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-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 libcurl4-openssl-dev pkg-config && \
34+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config && \
3535
apt-get install -y --reinstall lsb-base lsb-release
3636

3737
# raspbian/bookworm base image
@@ -44,7 +44,7 @@ RUN apt-get update && \
4444
cmake make bash sudo wget unzip dh-make \
4545
libsystemd-dev zlib1g-dev flex bison \
4646
libssl3 libssl-dev libpq-dev postgresql-server-dev-all \
47-
libsasl2-2 libsasl2-dev libyaml-dev libcurl4-openssl-dev pkg-config && \
47+
libsasl2-2 libsasl2-dev libyaml-dev libsnmp-dev libcurl4-openssl-dev pkg-config && \
4848
apt-get install -y --reinstall lsb-base lsb-release
4949

5050
# Common build for all distributions now

‎packaging/distros/ubuntu/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN apt-get update && \
2525
apt-get install -y curl ca-certificates build-essential libsystemd-dev \
2626
make bash wget unzip nano vim valgrind dh-make flex bison \
2727
libpq-dev postgresql-server-dev-all software-properties-common \
28-
software-properties-common libyaml-dev apt-transport-https \
28+
software-properties-common libyaml-dev libsnmp-dev apt-transport-https \
2929
pkg-config libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.0 \
3030
libcurl4-openssl-dev zlib1g-dev \
3131
tar gzip && \
@@ -57,7 +57,7 @@ RUN apt-get update && \
5757
make bash wget unzip nano vim valgrind dh-make flex bison \
5858
libpq-dev postgresql-server-dev-all \
5959
libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libcurl4-openssl-dev \
60-
software-properties-common libyaml-dev apt-transport-https pkg-config zlib1g-dev \
60+
software-properties-common libyaml-dev libsnmp-dev apt-transport-https pkg-config zlib1g-dev \
6161
tar gzip && \
6262
wget -q -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
6363
gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
@@ -91,7 +91,7 @@ RUN apt-get update && \
9191
make bash wget unzip nano vim valgrind dh-make flex bison \
9292
libpq-dev postgresql-server-dev-all \
9393
libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libcurl4-openssl-dev \
94-
software-properties-common libyaml-dev apt-transport-https pkg-config zlib1g-dev \
94+
software-properties-common libyaml-dev libsnmp-dev apt-transport-https pkg-config zlib1g-dev \
9595
tar gzip && \
9696
wget -q -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
9797
gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
@@ -121,7 +121,7 @@ RUN apt-get update && \
121121
make bash wget unzip nano vim valgrind dh-make flex bison \
122122
libpq-dev postgresql-server-dev-all \
123123
libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libcurl4-openssl-dev \
124-
libyaml-dev pkg-config zlib1g-dev \
124+
libyaml-dev libsnmp-dev pkg-config zlib1g-dev \
125125
tar gzip && \
126126
apt-get install -y --reinstall lsb-base lsb-release && \
127127
mkdir -p "${CMAKE_HOME}" && \
@@ -147,7 +147,7 @@ RUN apt-get update && \
147147
make bash wget unzip nano vim valgrind dh-make flex bison \
148148
libpq-dev postgresql-server-dev-all \
149149
libsasl2-2 libsasl2-dev openssl libssl-dev libssl1.1 libcurl4-openssl-dev \
150-
libyaml-dev pkg-config zlib1g-dev \
150+
libyaml-dev libsnmp-dev pkg-config zlib1g-dev \
151151
tar gzip && \
152152
apt-get install -y --reinstall lsb-base lsb-release && \
153153
mkdir -p "${CMAKE_HOME}" && \
@@ -171,7 +171,7 @@ RUN apt-get update && \
171171
make bash wget unzip nano vim valgrind dh-make flex bison \
172172
libpq-dev postgresql-server-dev-all libpq5 \
173173
libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libcurl4-openssl-dev \
174-
libyaml-dev pkg-config zlib1g-dev \
174+
libyaml-dev libsnmp-dev pkg-config zlib1g-dev \
175175
tar gzip && \
176176
apt-get install -y --reinstall lsb-base lsb-release && \
177177
mkdir -p "${CMAKE_HOME}" && \
@@ -197,7 +197,7 @@ RUN apt-get update && \
197197
make bash wget unzip nano vim valgrind dh-make flex bison \
198198
libpq-dev postgresql-server-dev-all libpq5 \
199199
libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libcurl4-openssl-dev \
200-
libyaml-dev pkg-config zlib1g-dev \
200+
libyaml-dev libsnmp-dev pkg-config zlib1g-dev \
201201
tar gzip && \
202202
apt-get install -y --reinstall lsb-base lsb-release && \
203203
mkdir -p "${CMAKE_HOME}" && \
@@ -221,7 +221,7 @@ RUN apt-get update && \
221221
make bash wget unzip nano vim valgrind dh-make flex bison \
222222
libpq-dev postgresql-server-dev-all libpq5 \
223223
libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libcurl4-openssl-dev \
224-
libyaml-dev pkg-config zlib1g-dev \
224+
libyaml-dev libsnmp-dev pkg-config zlib1g-dev \
225225
tar gzip && \
226226
apt-get install -y --reinstall lsb-base lsb-release && \
227227
mkdir -p "${CMAKE_HOME}" && \
@@ -247,7 +247,7 @@ RUN apt-get update && \
247247
make bash wget unzip nano vim valgrind dh-make flex bison \
248248
libpq-dev postgresql-server-dev-all libpq5 \
249249
libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libcurl4-openssl-dev \
250-
libyaml-dev pkg-config zlib1g-dev \
250+
libyaml-dev libsnmp-dev pkg-config zlib1g-dev \
251251
tar gzip && \
252252
apt-get install -y --reinstall lsb-base lsb-release && \
253253
mkdir -p "${CMAKE_HOME}" && \

0 commit comments

Comments
 (0)