Merge branch 'master' of https://github.com/CIRCL/AIL-framework

Dockerfile

@@ -1,14 +1,19 @@
 FROM ubuntu:16.04
 
-RUN mkdir /opt/AIL && apt-get update -y \
-	&& apt-get install git python-dev build-essential \
-	libffi-dev libssl-dev libfuzzy-dev wget sudo -y
+# Make sure that all updates are in place
+RUN apt-get clean && apt-get update -y && apt-get upgrade -y \
+        && apt-get dist-upgrade -y && apt-get autoremove -y
+
+# Install needed packages
+RUN apt-get install git python-dev build-essential \
+       libffi-dev libssl-dev libfuzzy-dev wget sudo -y
 
 # Adding sudo command
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 RUN echo "root ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
 # Installing AIL dependencies
+RUN mkdir /opt/AIL
 ADD . /opt/AIL
 WORKDIR /opt/AIL
 RUN ./installing_deps.sh 

README.md

@@ -153,6 +153,11 @@ Eventually you can browse the status of the AIL framework website at the followi
 http://localhost:7000/
 ```
 
+Training
+--------
+
+CIRCL organises training on how to use or extend the AIL framework. The next training will be [Thursday, 20 Dec](https://en.xing-events.com/ZEQWMLJ.html) in Luxembourg.
+
 HOWTO
 -----
 

pip3_packages_requirement.txt

@@ -2,7 +2,7 @@ pymisp
 
 thehive4py
 
-redis
+redis==2.10.6
 #filemagic conflict with magic
 crcmod
 mmh3
@@ -13,7 +13,6 @@ zmq
 langid
 
 #Essential
-redis
 pyzmq
 dnspython
 logbook