Skip to content

Commit c9c7a8b

Browse files
authored
Merge branch 'sflow:master' into master
2 parents fec091f + 8c41ebb commit c9c7a8b

File tree

188 files changed

+22450
-4950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+22450
-4950
lines changed

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
*.o
2+
*~
3+
*.so
4+
*.a
5+
*.deb
6+
*.rpm
7+
*.so.*

INSTALL.Linux

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ will typically be required for compilation:
2727
DBUS: dbus-dev(el) or libdbus-1-dev
2828
OPX: libsystemd-daemon-dev
2929
CONTAINERD: golang
30-
30+
K8S: uuid-dev or libuuid-devel
31+
3132
To start the daemon, run:
3233

3334
% sudo service hsflowd start

docker_build/centos7/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ RUN echo "EXTRAS" && yum -y install \
99
libxml2-devel \
1010
rpm-build \
1111
dbus-devel \
12-
openssl-devel
12+
openssl-devel \
13+
libuuid-devel
1314
RUN mkdir /packages && chown 777 /packages
1415
COPY build_hsflowd /root/build_hsflowd
1516
ENTRYPOINT ["/root/build_hsflowd"]

docker_build/centos7nvml/Dockerfile

Lines changed: 0 additions & 13 deletions
This file was deleted.

docker_build/centos7nvml/build_hsflowd

Lines changed: 0 additions & 17 deletions
This file was deleted.

docker_build/debian10/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM debian:buster
2+
RUN apt-get -y update && apt-get install -y --no-install-recommends \
3+
build-essential \
4+
git-all \
5+
libpcap-dev \
6+
libvirt-dev \
7+
libnfnetlink-dev \
8+
libxml2-dev \
9+
libssl-dev \
10+
libdbus-1-dev \
11+
uuid-dev \
12+
dmidecode
13+
RUN mkdir /packages && chown 777 /packages
14+
COPY build_hsflowd /root/build_hsflowd
15+
ENTRYPOINT ["/root/build_hsflowd"]
16+
17+
18+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
echo "build_hsflowd on platform: $1"
3+
4+
git clone https://github.com/sflow/host-sflow \
5+
&& cd host-sflow \
6+
&& make deb FEATURES="NFLOG PCAP TCP DOCKER KVM OVS DBUS SYSTEMD DROPMON PSAMPLE DENT CONTAINERD"
7+
8+
for deb in `ls *.deb`; do cp "$deb" "/packages/${deb/hsflowd/hsflowd-$1}"; done
9+
echo ""
10+
echo "files in /packages:"
11+
ls -l /packages
12+
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM debian:buster
2+
ARG DEBIAN_FRONTEND=noninteractive
3+
RUN apt-get update && apt-get install -y --no-install-recommends \
4+
build-essential \
5+
git-all \
6+
libpcap-dev \
7+
libvirt-dev \
8+
libnfnetlink-dev \
9+
libxml2-dev \
10+
libssl-dev \
11+
libdbus-1-dev \
12+
libhiredis-dev
13+
RUN mkdir /packages && chown 777 /packages
14+
COPY build_hsflowd /root/build_hsflowd
15+
ENTRYPOINT ["/root/build_hsflowd"]
16+
17+
18+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
echo "build_hsflowd on platform: $1"
3+
4+
git clone https://github.com/sflow/host-sflow \
5+
&& cd host-sflow \
6+
&& make deb FEATURES="SONIC"
7+
8+
for deb in `ls *.deb`; do cp "$deb" "/packages/${deb/hsflowd/hsflowd-$1}"; done
9+
echo ""
10+
echo "files in /packages:"
11+
ls -l /packages
12+

docker_build/debian11/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM debian:bullseye
2+
RUN apt-get -y update && apt-get install -y --no-install-recommends \
3+
build-essential \
4+
git-all \
5+
libpcap-dev \
6+
libvirt-dev \
7+
libnfnetlink-dev \
8+
libxml2-dev \
9+
libssl-dev \
10+
libdbus-1-dev \
11+
uuid-dev \
12+
dmidecode
13+
RUN mkdir /packages && chown 777 /packages
14+
COPY build_hsflowd /root/build_hsflowd
15+
ENTRYPOINT ["/root/build_hsflowd"]
16+
17+
18+

0 commit comments

Comments
 (0)