From 9d9bef02481b059d1797b996e891cc913c38cd57 Mon Sep 17 00:00:00 2001
From: Einar Lanfranco <einar.lanfranco@gmail.com>
Date: Tue, 10 May 2022 12:43:39 -0300
Subject: [PATCH] Dockerfile

---
 .docker/intelmq-full-dev/Dockerfile           |  5 ----
 .docker/intelmq-full-dev/entrypoint-dev.sh    | 29 -------------------
 .../install_reqs_and_deploy_bots              | 14 +++++----
 .gitignore                                    |  1 +
 docker-compose-dev.yml                        |  4 ++-
 5 files changed, 12 insertions(+), 41 deletions(-)
 delete mode 100644 .docker/intelmq-full-dev/entrypoint-dev.sh

diff --git a/.docker/intelmq-full-dev/Dockerfile b/.docker/intelmq-full-dev/Dockerfile
index b0e1f30..2e3d96a 100644
--- a/.docker/intelmq-full-dev/Dockerfile
+++ b/.docker/intelmq-full-dev/Dockerfile
@@ -11,13 +11,8 @@ RUN sudo apt-get update \
     && sudo rm -rf /var/lib/apt/lists/*
 
 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
 
 USER intelmq:intelmq
-
-ENTRYPOINT [ "/opt/entrypoint-dev.sh" ]
diff --git a/.docker/intelmq-full-dev/entrypoint-dev.sh b/.docker/intelmq-full-dev/entrypoint-dev.sh
deleted file mode 100644
index 67b2d6f..0000000
--- a/.docker/intelmq-full-dev/entrypoint-dev.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-export INTELMQ_IS_DOCKER=1
-
-if [[ ${IS_DEV} == "true" ]]
-then
-    cd /etc/intelmq
-    sudo pip3 install hug url-normalize geolib imbox jinja2 pyasn textx tld time-machine
-    sudo pip3 install --force pymisp[fileobjects,openioc,virustotal]
-    /opt/install_reqs_and_deploy_bots.sh
-fi
-
-sudo chown -R intelmq:intelmq /etc/intelmq
-sudo chown -R intelmq:intelmq /opt/intelmq
-
-intelmqctl upgrade-config
-intelmqctl check
-
-intelmq_user="${INTELMQ_API_USER:=intelmq}"
-intelmq_pass="${INTELMQ_API_PASS:=intelmq}"
-
-intelmq-api-adduser --user "$intelmq_user" --password "$intelmq_pass"
-
-if [[ $1 == "selftest" ]]
-then
-    export INTELMQ_TEST_EXOTIC=1
-    nosetests3 /etc/intelmq/intelmq/tests
-else
-    cd /etc/intelmq-api && hug -m intelmq_api.serve -p8080
-fi
diff --git a/.docker/intelmq-full-dev/install_reqs_and_deploy_bots b/.docker/intelmq-full-dev/install_reqs_and_deploy_bots
index cc75155..3bedd27 100755
--- a/.docker/intelmq-full-dev/install_reqs_and_deploy_bots
+++ b/.docker/intelmq-full-dev/install_reqs_and_deploy_bots
@@ -1,11 +1,13 @@
 #!/bin/bash
-rm -f /tmp/orderfullrequirements.txt /tmp/fullrequirements.txt
-for file in $(find /etc/intelmq/intelmq/bots -name "*REQUIREMENTS.txt"); do 
-   cat $file >> /tmp/fullrequirements.txt
+sudo cp -r $MY_FORK/$MY_BOTS_FOLDER/* /etc/intelmq/intelmq/bots/
+sudo rm -f /tmp/orderfullrequirements.txt /tmp/fullrequirements.txt
+for req in $(find $MY_FORK/$MY_BOTS_FOLDER -name "*REQUIREMENTS.txt"); do 
+   cat $req >> /tmp/fullrequirements.txt
 done
 cat /tmp/fullrequirements.txt | sort | uniq > /tmp/orderfullrequirements.txt
 sudo pip3 install -r /tmp/orderfullrequirements.txt; 
-cd /etc/intelmq
-sudo pip3 install --no-cache-dir -e .
 
-sudo intelmqsetup
+
+#cd /etc/intelmq
+#sudo pip3 install --no-cache-dir -e .
+#sudo intelmqsetup
diff --git a/.gitignore b/.gitignore
index d0f6aba..0142308 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 intelmq_logs/
 intelmq_persistence/
+my_fork_of_intelmq/
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index dbbf6ce..0dd8003 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -24,7 +24,7 @@ services:
             - ./example_config/intelmq-api/config.json:/etc/intelmq/api-config.json
             - ./intelmq_logs:/opt/intelmq/var/log
             - ./intelmq_output:/opt/intelmq/var/lib/bots
-            - ./my_fork_of_intelmq/intelmq/:/etc/intelmq/intelmq/
+            - ./my_fork_of_intelmq/:${MY_FORK}/${MY_BOTS_FOLDER}
         depends_on: 
             - redis
         environment:
@@ -36,6 +36,8 @@ services:
             INTELMQ_SOURCE_PIPELINE_HOST: redis
             INTELMQ_DESTINATION_PIPELINE_HOST: redis
             INTELMQ_REDIS_CACHE_HOST: redis
+            MY_FORK: "my_fork_of_intelmq"
+            MY_BOTS_FOLDER: "intelmq/bots"
         networks:
             - intelmq-internal
 networks: