Merge branch 'main' of https://github.com/certat/intelmq-docker into main

.docker/intelmq-full-dev/Dockerfile

@@ -1,25 +1,18 @@
-FROM certat/intelmq-full:latest
-ENV LANG C.UTF-8
+FROM certat/intelmq-full:1.0
 
-LABEL maintainer="Einar <elanfranco@csirtamericas.org>"
-LABEL maintainer="Jeremias <jpretto@cert.unlp.edu.ar>" 
-LABEL maintainer="Mateo <mdurante@cert.unlp.edu.ar>" 
-RUN sudo apt-get update \
-    && sudo apt-get install -y --no-install-recommends \
-    git \
-    vim \
-    ssh \
-    && sudo rm -rf /var/lib/apt/lists/*
+ADD entrypoint_dev.sh /opt/dev/entrypoint_dev.sh
+ADD update.sh /opt/dev/update.sh
+ADD merge_BOTS.py /opt/dev/merge_BOTS.py
 
-WORKDIR /opt
-ADD entrypoint-dev.sh /opt/entrypoint-dev.sh
-ADD install_reqs_and_deploy_bots /opt/install_reqs_and_deploy_bots.sh
-RUN sudo chmod +x /opt/entrypoint-dev.sh \
-    && sudo chown intelmq:intelmq /opt/entrypoint-dev.sh
-RUN sudo chmod +x /opt/install_reqs_and_deploy_bots.sh \
-    && sudo chown intelmq:intelmq /opt/install_reqs_and_deploy_bots.sh
+# Merge bots for merge_BOTS.py
+RUN sudo python3 -m pip install jsonmerge
 
+USER intelmq:intelmq
 
-USER intelmq
+# Permission denied when installing new bots
+RUN sudo chown -R intelmq:intelmq /opt/intelmq/intelmq.egg-info
+
+ENV PATH="/opt/intelmq/.local/bin:${PATH}"
+
+ENTRYPOINT ["/opt/dev/entrypoint_dev.sh"]
 
-ENTRYPOINT [ "/opt/entrypoint-dev.sh" ]

.docker/intelmq-full-dev/entrypoint-dev.sh

@@ -27,4 +27,4 @@ then
     nosetests3 /opt/intelmq/intelmq/tests
 else
     cd /opt/intelmq-api && hug -m intelmq_api.serve -p8080
-fi
+fi

.docker/intelmq-full/Dockerfile

@@ -20,6 +20,7 @@ RUN apt-get update \
     sudo \
     gcc \
     rsync \
+    ssh \
     python3-pika \
     python3-nose \
     python3-dev \
@@ -33,6 +34,8 @@ RUN apt-get update \
     python3-cerberus \
     python3-requests-mock \
     python3-shodan \
+    python3-elasticsearch \
+    python3-pymongo \
     libfuzzy-dev \
     && rm -rf /var/lib/apt/lists/*