diff --git a/.gitignore b/.gitignore index b31701b..ec71817 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ target/ *.pcap +.github + docker-compose.yml +Dockerfile +.dockerignore diff --git a/Dockerfile b/Dockerfile index 4b0d337..f090713 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,15 @@ -FROM ubuntu:22.04 +FROM ubuntu:22.04 as build -ENV VERSION=4.5.0 +ENV VERSION=5.1.0 +ADD https://www.wireshark.org/download/automated/data/manuf /opt/arkime/etc/oui.txt +ADD https://www.iana.org/assignments/ipv4-address-space/ipv4-address-space.csv /opt/arkime/etc/ipv4-address-space.csv -ADD https://s3.amazonaws.com/files.molo.ch/builds/ubuntu-22.04/arkime_${VERSION}-1_amd64.deb . -RUN apt update && \ - apt install -y htop nano tree curl libwww-perl libjson-perl ethtool libyaml-dev liblua5.4-0 libmaxminddb0 libcurl4 libpcap0.8 libglib2.0-0 libnghttp2-14 libyara8 librdkafka1 && \ - dpkg -i arkime_${VERSION}-1_amd64.deb && \ - apt install -y libmagic-dev && \ - rm -rf arkime_$VERSION-1_amd64.deb && \ - rm -rf /var/lib/apt/lists/* +RUN apt-get update && \ + apt-get install -y libwww-perl libjson-perl ethtool libyaml-dev liblua5.4-0 libmaxminddb0 libcurl4 libpcap0.8 libglib2.0-0 libnghttp2-14 libyara8 librdkafka1 curl -RUN curl https://fossies.org/linux/misc/wireshark-4.0.8.tar.xz/wireshark-4.0.8/manuf?m=b > /opt/arkime/etc/oui.txt -RUN curl https://www.iana.org/assignments/ipv4-address-space/ipv4-address-space.csv > /opt/arkime/etc/ipv4-address-space.csv +WORKDIR /EnoArkime +ADD https://github.com/arkime/arkime/releases/download/v$VERSION/arkime_$VERSION-1.ubuntu2204_amd64.deb . +RUN dpkg -i ./*.deb; apt-get install -fy && rm -rf /var/lib/apt/lists/* && rm *.deb COPY elasticsearch_init.sh elasticsearch_init.sh COPY arkime-viewer.sh arkime-viewer.sh @@ -19,4 +17,8 @@ COPY arkime-capture.sh arkime-capture.sh COPY docker-entrypoint.sh docker-entrypoint.sh COPY config.ini /opt/arkime/etc/config.ini -ENTRYPOINT /docker-entrypoint.sh + +FROM scratch +WORKDIR /EnoArkime +ENTRYPOINT /EnoArkime/docker-entrypoint.sh +COPY --from=build / / diff --git a/config.ini b/config.ini index 08168af..dc9fada 100644 --- a/config.ini +++ b/config.ini @@ -12,6 +12,7 @@ # 3rd) The section titled "default" is used last. [default] +authMode=anonymous # Comma seperated list of elasticsearch host:port combinations. If not using a # Elasticsearch load balancer, a different elasticsearch node in the cluster can be specified # for each Arkime node to help spread load on high volume clusters. For user/password diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index cbf633c..16489b3 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/sh -bash /elasticsearch_init.sh || exit 1 -sh /arkime-capture.sh & -sh /arkime-viewer.sh & +bash ./elasticsearch_init.sh || exit 1 +sh ./arkime-capture.sh & +sh ./arkime-viewer.sh & wait