CSEC_PUBLIC/intelmq-docker
1
0
Fork 0
mirror of https://github.com/certat/intelmq-docker.git synced 2025-12-06 09:12:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Wagner suggestions

Browse Source
This commit is contained in:
Einar Lanfranco
2021-03-25 15:41:24 -03:00
parent b1c3677f90
commit 9ff46cb1e6
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.docker/intelmq-full-dev/Dockerfile
View File

@@ -3,20 +3,17 @@ FROM certat/intelmq-full:1.0
MAINTAINER Einar <elanfranco@cert.unlp.edu.ar>
MAINTAINER Jeremias <jpretto@cert.unlp.edu.ar>
USER root
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
# Merge bots for merge_BOTS.py
RUN python3 -m pip install jsonmerge
RUN sudo python3 -m pip install jsonmerge
# Permission denied when installing new bots
RUN chown -R intelmq:intelmq /opt/intelmq/intelmq.egg-info
RUN sudo chown -R intelmq:intelmq /opt/intelmq/intelmq.egg-info
USER intelmq:intelmq
ENV PATH="/opt/intelmq/.local/bin:${PATH}"
ENTRYPOINT ["/opt/dev/entrypoint_dev.sh"]

2
.docker/intelmq-full-dev/merge_BOTS.py
View File

@@ -35,4 +35,4 @@ reordered_dict.update({k: merged[k] for k in merged.keys() - desired_order_list}
with open(args.output_file, 'w') as f:
json.dump(reordered_dict, f, indent=4)

28
.docker/intelmq-full-dev/update.sh
View File

@@ -3,18 +3,24 @@
echo "Installing requirements for bots in dev repository"
for file in $(find /opt/dev/mybots -name "*REQUIREMENTS.txt"); do pip3 install -r $file; done
# Backup Original BOTS
cp /opt/intelmq/intelmq/bots/BOTS /opt/intelmq/intelmq/bots/BOTS.bk
echo "Merge your BOTS file with BOTS"
python3 /opt/dev/merge_BOTS.py "/opt/dev/mybots/BOTS" "/opt/intelmq/intelmq/bots/BOTS" "/opt/intelmq/intelmq/bots/BOTS"
cp /opt/intelmq/intelmq/bots/BOTS /opt/intelmq/etc/BOTS
echo "Copying BOTS"
cp -a /opt/dev/mybots/bots/* /opt/intelmq/intelmq/bots/
if [ test -f /opt/intelmq/intelmq/bots/BOTS ]; then
if [ "${AUTO_MIX_BOTS}" = "true" ]; then
# Backup Original BOTS
cp /opt/intelmq/intelmq/bots/BOTS /opt/intelmq/intelmq/bots/BOTS.bk
echo "Merge your BOTS file with BOTS"
python3 /opt/dev/merge_BOTS.py "/opt/dev/mybots/BOTS" "/opt/intelmq/intelmq/bots/BOTS" "/opt/intelmq/intelmq/bots/BOTS"
cp /opt/intelmq/intelmq/bots/BOTS /opt/intelmq/etc/BOTS
echo "Copying BOTS"
cp -a /opt/dev/mybots/bots/* /opt/intelmq/intelmq/bots/
# Restore original BOTS
mv /opt/intelmq/intelmq/bots/BOTS.bk /opt/intelmq/intelmq/bots/BOTS
else
cp /opt/intelmq/etc/BOTS /opt/intelmq/intelmq/bots/BOTS
fi
fi
echo "Installing new BOTS"
cd /opt/intelmq && pip3 install -e . --user && python3 setup.py install --user
# Restore original BOTS
mv /opt/intelmq/intelmq/bots/BOTS.bk /opt/intelmq/intelmq/bots/BOTS

2
mybots/BOTS
View File

@@ -14,4 +14,4 @@
"Output": {
}
}
}