release 0.7.0 [WIP]

emulation-system/base_images/docker_files/ubuntu_14_base/docker/Dockerfile

@@ -111,6 +111,15 @@ RUN echo ". $CONDA_DIR/etc/profile.d/conda.sh" >> ~/.profile
 # make conda activate command available from /bin/bash --interative shells
 RUN conda init bash
 
+# Setup base environment with csle-collector
+SHELL ["conda", "run", "-n", "base", "/bin/bash", "-c"]
+RUN pip install flask &&\
+    pip install waitress &&\
+    pip install confluent-kafka===1.8.2 &&\
+    pip install csle-collector &&\
+    pip install pyspark &&\
+    pip install netifaces
+
 # Setup Samba
 ADD docker_files/common/samba_exploit.py /samba_exploit.py
 ADD docker_files/common/bindshell-samba.c /bindshell-samba.c
@@ -136,14 +145,6 @@ RUN mkdir -p /web/ &&\
 ADD docker_files/common/web_server.py /web/web_server.py
 ADD docker_files/common/index.html /web/static/index.html
 
-# Setup base environment with csle-collector
-SHELL ["conda", "run", "-n", "base", "/bin/bash", "-c"]
-RUN pip install flask &&\
-    pip install waitress &&\
-    pip install csle-collector &&\
-    pip install pyspark &&\
-    pip install netifaces
-
 # Back to normal shell
 SHELL ["/bin/bash", "--login", "-c"]
 

simulation-system/libs/csle-ryu/requirements.txt

@@ -2,5 +2,5 @@ csle-base==0.7.0
 csle-collector==0.7.0
 csle-ryu-fork==4.37.0.dev3357
 eventlet==0.33.2
-confluent-kafka==1.9.2
+confluent-kafka==1.8.2
 dnspython==2.2.1

simulation-system/libs/csle-ryu/setup.cfg

@@ -24,7 +24,7 @@ install_requires =
     csle-ryu-fork>=4.37.0.dev3357
     dnspython==2.2.1
     eventlet>=0.33.2
-    confluent-kafka>=1.9.2
+    confluent-kafka>=1.8.2
 python_requires = >=3.8
 package_dir =
     =src