From 7f0a88d368dcbabc645a0e6c285f9aadd098a717 Mon Sep 17 00:00:00 2001
From: William O <willoldert@gmail.com>
Date: Fri, 31 May 2024 14:39:19 -0600
Subject: [PATCH] organization of dockerfile

---
 Dockerfile             | 25 ++++++++++++-------------
 Framework/mininet-wifi |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4eb9fd3..3ca02b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,27 +9,26 @@ WORKDIR /wififorge
 COPY . .
 
 RUN apt-get update -y && apt-get upgrade --fix-missing -y --no-install-recommends
-RUN apt install -y git
-RUN apt install -y sudo
-RUN apt install -y python3-pip
+RUN apt install -y \
+     git \
+     sudo \
+     python3-pip \
+     curl \
+     wget \
+     aircrack-ng \
+     dsniff \
+     mininet --allow-downgrades \
+     iputils-ping
+
 RUN git config --global --add safe.directory $PWD
 RUN git submodule init
 RUN git submodule update
 
 RUN python3 -m pip config set global.break-system-packages true
 
-RUN apt install -y curl wget
 RUN chmod +x ./Framework/dependencies.sh
 RUN ./Framework/dependencies.sh 
 
-RUN apt-get install -y --no-install-recommends \
-#    aircrack-ng \
-#    john \
-#    dsniff \
-     mininet --allow-downgrades \
-     iputils-ping
-
 RUN ./Framework/mininet-wifi/util/install.sh -Wlnfv
 RUN sudo make -C Framework/mininet-wifi install
-RUN sudo /usr/share/openvswitch/scripts/ovs-ctl start
-#CMD python3 Framework/WifiForge.py
\ No newline at end of file
+RUN service openvswitch-switch start
\ No newline at end of file
diff --git a/Framework/mininet-wifi b/Framework/mininet-wifi
index 97a177b..154ad15 160000
--- a/Framework/mininet-wifi
+++ b/Framework/mininet-wifi
@@ -1 +1 @@
-Subproject commit 97a177bf16c720fb9f10569d28a6d345a91ae4e6
+Subproject commit 154ad15c44594d131ac63d8c452fbd4c664b76c9