Skip to content
This repository has been archived by the owner on May 29, 2024. It is now read-only.

Update to Bullseye Docker-base & Debian-maintained Broker libs #132

Merged
merged 3 commits into from
Jun 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/python-egg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,15 @@ jobs:
test:
name: Unit Tests
runs-on: ubuntu-latest
container: fixel/zeek:broker-latest
# The image is based on Debian-10 and has `zeek/broker` pre-installed
container: debian:bullseye
steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.ref }}
- name: Set up Dist Environment
run: |
apt-get -qq update
apt-get -qqy install python3-pip
apt-get -qqy install python3-pip software-properties-common gnupg2 libbroker2 python3-broker
update-alternatives --install /usr/bin/python python /usr/bin/python3 1
python -m pip install --upgrade pip
python -m pip install wheel setuptools
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ Every entry has a category for which we use the following visual abbreviations:

## Unreleased

- ⚠️ The official [tenzir/threatbus](https://hub.docker.com/r/tenzir/threatbus)
Docker image now uses Debian:Bullseye as
[base image](https://hub.docker.com/_/debian) and uses the Debian-maintained
Broker libraries to enable communication with [Zeek](https://zeek.org/).
[#132](https://github.com/tenzir/threatbus/pull/132)

- ⚠️ The Threat Bus community chat moved from Gitter to Slack.
[Join us](http://slack.tenzir.com) in the `#threatbus` channel for
interactive discussions.
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM fixel/zeek:broker-latest
FROM debian:bullseye

RUN apt-get -qq update && apt-get -qqy install \
python3-pip wget software-properties-common gnupg2
python3-pip software-properties-common gnupg2 libbroker2 python3-broker

RUN pip3 install --upgrade pip

Expand All @@ -13,7 +13,7 @@ COPY README.md .
COPY threatbus threatbus
COPY plugins plugins
RUN python3 -m pip install . && \
#python3 -m pip install plugins/apps/threatbus_cif3 && \
python3 -m pip install plugins/apps/threatbus_cif3 && \
python3 -m pip install plugins/apps/threatbus_misp[zmq] && \
python3 -m pip install plugins/apps/threatbus_zeek && \
python3 -m pip install plugins/apps/threatbus_zmq_app && \
Expand All @@ -22,4 +22,4 @@ RUN python3 -m pip install . && \
COPY config* ./

ENTRYPOINT ["threatbus"]
CMD ["-c", "config.yaml"]
CMD ["-h"]