This is an automated email from the ASF dual-hosted git repository.
otto pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metron-bro-plugin-kafka.git
The following commit(s) were added to refs/heads/master by this push:
new 1772b1f METRON-2346 Update kafka plugin testing dependencies
(JonZeolla via ottobackwards) closes apache/metron-bro-plugin-kafka#41
1772b1f is described below
commit 1772b1fabb50e0710eafe93c14ec2d678c0a8bb9
Author: JonZeolla <[email protected]>
AuthorDate: Mon Apr 27 09:34:49 2020 -0400
METRON-2346 Update kafka plugin testing dependencies (JonZeolla via
ottobackwards) closes apache/metron-bro-plugin-kafka#41
---
docker/README.md | 4 ++--
docker/containers/bro-localbuild-container/Dockerfile | 6 ++++--
docker/scripts/docker_run_zookeeper_container.sh | 2 +-
docker/scripts/download_sample_pcaps.sh | 4 ++--
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/docker/README.md b/docker/README.md
index dbfbd89..c82e247 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -188,9 +188,9 @@ testing scripts to be added to a pull request, and
subsequently to a test suite.
- `download_sample_pcaps.sh`: Downloads the sample pcaps to a specified
directory. If they exist, it is a no-op
> The sample pcaps are:
- > - https://www.bro.org/static/traces/exercise-traffic.pcap
+ > -
https://github.com/bro/try-bro/blob/master/manager/static/pcaps/exercise_traffic.pcap
> -
http://downloads.digitalcorpora.org/corpora/network-packet-dumps/2008-nitroba/nitroba.pcap
- > - https://www.bro.org/static/traces/ssh.pcap
+ > -
https://github.com/bro/try-bro/raw/master/manager/static/pcaps/ssh.pcap
> -
https://github.com/markofu/pcaps/blob/master/PracticalPacketAnalysis/ppa-capture-files/ftp.pcap?raw=true
> -
https://github.com/EmpowerSecurityAcademy/wireshark/blob/master/radius_localhost.pcapng?raw=true
> - https://github.com/kholia/my-pcaps/blob/master/VNC/07-vnc
diff --git a/docker/containers/bro-localbuild-container/Dockerfile
b/docker/containers/bro-localbuild-container/Dockerfile
index b35724e..9b34baa 100644
--- a/docker/containers/bro-localbuild-container/Dockerfile
+++ b/docker/containers/bro-localbuild-container/Dockerfile
@@ -30,8 +30,10 @@ RUN yum -y groupinstall "Development Tools" && \
COPY .screenrc /root
# install bro
-RUN curl -L https://www.bro.org/downloads/bro-2.5.5.tar.gz | tar xvz
-WORKDIR bro-2.5.5/
+RUN git clone https://github.com/bro/bro
+WORKDIR bro/
+RUN git checkout v2.5.5
+RUN git submodule update --init --recursive
RUN ./configure
RUN make
RUN make install
diff --git a/docker/scripts/docker_run_zookeeper_container.sh
b/docker/scripts/docker_run_zookeeper_container.sh
index c6024b0..b35b813 100755
--- a/docker/scripts/docker_run_zookeeper_container.sh
+++ b/docker/scripts/docker_run_zookeeper_container.sh
@@ -78,5 +78,5 @@ rc=$?; if [[ ${rc} != 0 ]]; then
exit ${rc}
fi
-echo "Started the zookeeper container with networ ${NETWORK_NAME}"
+echo "Started the zookeeper container with network ${NETWORK_NAME}"
diff --git a/docker/scripts/download_sample_pcaps.sh
b/docker/scripts/download_sample_pcaps.sh
index 6a12af3..408dcac 100755
--- a/docker/scripts/download_sample_pcaps.sh
+++ b/docker/scripts/download_sample_pcaps.sh
@@ -87,7 +87,7 @@ for folder in nitroba example-traffic ssh ftp radius rfb; do
done
if [[ ! -f "${DATA_PATH}"/example-traffic/exercise-traffic.pcap ]]; then
- wget https://www.bro.org/static/traces/exercise-traffic.pcap -O
"${DATA_PATH}"/example-traffic/exercise-traffic.pcap
+ wget
https://github.com/bro/try-bro/raw/master/manager/static/pcaps/exercise_traffic.pcap
-O "${DATA_PATH}"/example-traffic/exercise-traffic.pcap
fi
if [[ ! -f "${DATA_PATH}"/nitroba/nitroba.pcap ]]; then
@@ -95,7 +95,7 @@ if [[ ! -f "${DATA_PATH}"/nitroba/nitroba.pcap ]]; then
fi
if [[ ! -f "${DATA_PATH}"/ssh/ssh.pcap ]]; then
- wget https://www.bro.org/static/traces/ssh.pcap -O
"${DATA_PATH}"/ssh/ssh.pcap
+ wget https://github.com/bro/try-bro/raw/master/manager/static/pcaps/ssh.pcap
-O "${DATA_PATH}"/ssh/ssh.pcap
fi
if [[ ! -f "${DATA_PATH}"/ftp/ftp.pcap ]]; then
