From 9c0a65cad87819fa171d0f6f4313d43fe420f686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thirion=20Aur=C3=A9lien?= <Terrtia@users.noreply.github.com>
Date: Thu, 29 Nov 2018 08:58:24 +0100
Subject: [PATCH 1/4] fix: [requirement] force redis version

---
 pip3_packages_requirement.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pip3_packages_requirement.txt b/pip3_packages_requirement.txt
index dd447d5c..12ef09ff 100644
--- a/pip3_packages_requirement.txt
+++ b/pip3_packages_requirement.txt
@@ -2,7 +2,7 @@ pymisp
 
 thehive4py
 
-redis
+redis==2.10.6
 #filemagic conflict with magic
 crcmod
 mmh3

From 423ddb6a3429fd623e9cc6f892fa15c147dc7b4b Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Mon, 3 Dec 2018 17:34:11 +0100
Subject: [PATCH 2/4] training added

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 9b447bac..fbcb5363 100644
--- a/README.md
+++ b/README.md
@@ -155,6 +155,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
 -----
 

From 08661eda4e3c34c285d5d53ee95ffdf54cd1cc78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thirion=20Aur=C3=A9lien?= <Terrtia@users.noreply.github.com>
Date: Wed, 5 Dec 2018 08:57:17 +0100
Subject: [PATCH 3/4] fix: [requirements] remove duplicate entry, #296

---
 pip3_packages_requirement.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pip3_packages_requirement.txt b/pip3_packages_requirement.txt
index 12ef09ff..3991e158 100644
--- a/pip3_packages_requirement.txt
+++ b/pip3_packages_requirement.txt
@@ -13,7 +13,6 @@ zmq
 langid
 
 #Essential
-redis
 pyzmq
 dnspython
 logbook

From 3ff991995e61689e15900abc3e944cc3e0146fb9 Mon Sep 17 00:00:00 2001
From: Mike Eriksson <swedishmike@users.noreply.github.com>
Date: Sun, 9 Dec 2018 12:29:31 +0000
Subject: [PATCH 4/4] Changed the Dockerfile so that it starts with installing
 any and all outstanding updates for Ubuntu

---
 Dockerfile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 71318ba4..340e5014 100644
--- a/Dockerfile
+++ b/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