From fe6b85b9e5b7a8d123c50b4fcd75a561b443f03e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20De=20Keersmaeker?=
 <francois.dekeersmaeker@uclouvain.be>
Date: Tue, 17 Sep 2024 18:54:33 +0000
Subject: [PATCH] Fixed Docker build

---
 Dockerfile                                    |  4 +-
 docker-compose.yaml                           |  4 +-
 openwrt/linksys-wrt1200ac/config-minimal      | 47 +++++++++++++++++++
 .../linksys-wrt1200ac.cmake                   |  0
 openwrt/tl-wdr4900/config-minimal             | 46 ++++++++++++++++++
 openwrt/{ => tl-wdr4900}/tl-wdr4900.cmake     |  0
 6 files changed, 97 insertions(+), 4 deletions(-)
 create mode 100644 openwrt/linksys-wrt1200ac/config-minimal
 rename openwrt/{ => linksys-wrt1200ac}/linksys-wrt1200ac.cmake (100%)
 create mode 100644 openwrt/tl-wdr4900/config-minimal
 rename openwrt/{ => tl-wdr4900}/tl-wdr4900.cmake (100%)

diff --git a/Dockerfile b/Dockerfile
index e8ba293..2cafdca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,7 +56,7 @@ RUN ${OPENWRT_HOME}/scripts/feeds update -a
 RUN ${OPENWRT_HOME}/scripts/feeds install -a
 
 # Configure OpenWrt toolchain
-COPY openwrt/${ROUTER}/config/config-minimal ${OPENWRT_HOME}/.config
+COPY openwrt/${ROUTER}/config-minimal ${OPENWRT_HOME}/.config
 RUN make defconfig
 RUN make download
 RUN make -j $(($(nproc)+1))
@@ -69,4 +69,4 @@ ENV PATH=${TOOLCHAIN_PATH}/bin:$PATH
 
 # At runtime, run cross-compilation for OpenWrt
 WORKDIR ${HOME}/iot-firewall
-CMD ${HOME}/iot-firewall/build.sh -t ${HOME}/iot-firewall/openwrt/${ROUTER}.cmake
+CMD ${HOME}/iot-firewall/build.sh -t ${HOME}/iot-firewall/openwrt/${ROUTER}/${ROUTER}.cmake
diff --git a/docker-compose.yaml b/docker-compose.yaml
index dec93bf..6abc6ea 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -8,5 +8,5 @@ services:
       #- ROUTER=linksys-wrt1200ac
     volumes:
       - .:/home/user/iot-firewall
-    command: ["/home/user/iot-firewall/build.sh", "-t", "/home/user/iot-firewall/openwrt/tl-wdr4900.cmake"]
-    #command: ["/home/user/iot-firewall/build.sh", "-t", "/home/user/iot-firewall/openwrt/linksys-wrt1200ac.cmake"]
+    command: ["/home/user/iot-firewall/build.sh", "-t", "/home/user/iot-firewall/openwrt/tl-wdr4900/tl-wdr4900.cmake"]
+    #command: ["/home/user/iot-firewall/build.sh", "-t", "/home/user/iot-firewall/openwrt/linksys-wrt1200ac/linksys-wrt1200ac.cmake"]
diff --git a/openwrt/linksys-wrt1200ac/config-minimal b/openwrt/linksys-wrt1200ac/config-minimal
new file mode 100644
index 0000000..312ffe1
--- /dev/null
+++ b/openwrt/linksys-wrt1200ac/config-minimal
@@ -0,0 +1,47 @@
+CONFIG_TARGET_mvebu=y
+CONFIG_TARGET_mvebu_cortexa9=y
+CONFIG_TARGET_mvebu_cortexa9_DEVICE_linksys_wrt1200ac=y
+CONFIG_PACKAGE_arptables-nft=y
+CONFIG_PACKAGE_ebtables-nft=y
+CONFIG_PACKAGE_ip6tables-nft=y
+CONFIG_PACKAGE_iptables-mod-iface=y
+CONFIG_PACKAGE_iptables-mod-nflog=y
+CONFIG_PACKAGE_iptables-mod-nfqueue=y
+CONFIG_PACKAGE_iptables-nft=y
+CONFIG_PACKAGE_kmod-arptables=y
+CONFIG_PACKAGE_kmod-br-netfilter=y
+CONFIG_PACKAGE_kmod-ebtables=y
+CONFIG_PACKAGE_kmod-ebtables-ipv4=y
+CONFIG_PACKAGE_kmod-ebtables-ipv6=y
+CONFIG_PACKAGE_kmod-ip6tables=y
+CONFIG_PACKAGE_kmod-ipt-conntrack=y
+CONFIG_PACKAGE_kmod-ipt-core=y
+CONFIG_PACKAGE_kmod-ipt-iface=y
+CONFIG_PACKAGE_kmod-ipt-nflog=y
+CONFIG_PACKAGE_kmod-ipt-nfqueue=y
+CONFIG_PACKAGE_kmod-nf-ipt=y
+CONFIG_PACKAGE_kmod-nf-ipt6=y
+CONFIG_PACKAGE_kmod-nfnetlink-log=y
+CONFIG_PACKAGE_kmod-nfnetlink-queue=y
+CONFIG_PACKAGE_kmod-nft-arp=y
+CONFIG_PACKAGE_kmod-nft-bridge=y
+CONFIG_PACKAGE_kmod-nft-compat=y
+CONFIG_PACKAGE_kmod-nft-connlimit=y
+CONFIG_PACKAGE_kmod-nft-dup-inet=y
+CONFIG_PACKAGE_kmod-nft-netdev=y
+CONFIG_PACKAGE_kmod-nft-queue=y
+CONFIG_PACKAGE_libiptext=y
+CONFIG_PACKAGE_libiptext-nft=y
+CONFIG_PACKAGE_libiptext6=y
+CONFIG_PACKAGE_libnetfilter-log=y
+CONFIG_PACKAGE_libnetfilter-queue=y
+CONFIG_PACKAGE_libnfnetlink=y
+CONFIG_PACKAGE_libxtables=y
+CONFIG_PACKAGE_xtables-nft=y
+CONFIG_NF_DUP_NETDEV=y
+CONFIG_NFT_DUP_NETDEV=y
+CONFIG_NF_DUP_IPV4=y
+CONFIG_NFT_DUP_IPV4=y
+CONFIG_NF_DUP_IPV6=y
+CONFIG_NFT_DUP_IPV6=y
+
diff --git a/openwrt/linksys-wrt1200ac.cmake b/openwrt/linksys-wrt1200ac/linksys-wrt1200ac.cmake
similarity index 100%
rename from openwrt/linksys-wrt1200ac.cmake
rename to openwrt/linksys-wrt1200ac/linksys-wrt1200ac.cmake
diff --git a/openwrt/tl-wdr4900/config-minimal b/openwrt/tl-wdr4900/config-minimal
new file mode 100644
index 0000000..37af99d
--- /dev/null
+++ b/openwrt/tl-wdr4900/config-minimal
@@ -0,0 +1,46 @@
+CONFIG_TARGET_mpc85xx=y
+CONFIG_TARGET_mpc85xx_p1010=y
+CONFIG_TARGET_mpc85xx_p1010_DEVICE_tplink_tl-wdr4900-v1=y
+CONFIG_PACKAGE_arptables-nft=y
+CONFIG_PACKAGE_ebtables-nft=y
+CONFIG_PACKAGE_ip6tables-nft=y
+CONFIG_PACKAGE_iptables-mod-iface=y
+CONFIG_PACKAGE_iptables-mod-nflog=y
+CONFIG_PACKAGE_iptables-mod-nfqueue=y
+CONFIG_PACKAGE_iptables-nft=y
+CONFIG_PACKAGE_kmod-arptables=y
+CONFIG_PACKAGE_kmod-br-netfilter=y
+CONFIG_PACKAGE_kmod-ebtables=y
+CONFIG_PACKAGE_kmod-ebtables-ipv4=y
+CONFIG_PACKAGE_kmod-ebtables-ipv6=y
+CONFIG_PACKAGE_kmod-ip6tables=y
+CONFIG_PACKAGE_kmod-ipt-conntrack=y
+CONFIG_PACKAGE_kmod-ipt-core=y
+CONFIG_PACKAGE_kmod-ipt-iface=y
+CONFIG_PACKAGE_kmod-ipt-nflog=y
+CONFIG_PACKAGE_kmod-ipt-nfqueue=y
+CONFIG_PACKAGE_kmod-nf-ipt=y
+CONFIG_PACKAGE_kmod-nf-ipt6=y
+CONFIG_PACKAGE_kmod-nfnetlink-log=y
+CONFIG_PACKAGE_kmod-nfnetlink-queue=y
+CONFIG_PACKAGE_kmod-nft-arp=y
+CONFIG_PACKAGE_kmod-nft-bridge=y
+CONFIG_PACKAGE_kmod-nft-compat=y
+CONFIG_PACKAGE_kmod-nft-connlimit=y
+CONFIG_PACKAGE_kmod-nft-dup-inet=y
+CONFIG_PACKAGE_kmod-nft-netdev=y
+CONFIG_PACKAGE_kmod-nft-queue=y
+CONFIG_PACKAGE_libiptext=y
+CONFIG_PACKAGE_libiptext-nft=y
+CONFIG_PACKAGE_libiptext6=y
+CONFIG_PACKAGE_libnetfilter-log=y
+CONFIG_PACKAGE_libnetfilter-queue=y
+CONFIG_PACKAGE_libnfnetlink=y
+CONFIG_PACKAGE_libxtables=y
+CONFIG_PACKAGE_xtables-nft=y
+CONFIG_NF_DUP_NETDEV=y
+CONFIG_NFT_DUP_NETDEV=y
+CONFIG_NF_DUP_IPV4=y
+CONFIG_NFT_DUP_IPV4=y
+CONFIG_NF_DUP_IPV6=y
+CONFIG_NFT_DUP_IPV6=y
diff --git a/openwrt/tl-wdr4900.cmake b/openwrt/tl-wdr4900/tl-wdr4900.cmake
similarity index 100%
rename from openwrt/tl-wdr4900.cmake
rename to openwrt/tl-wdr4900/tl-wdr4900.cmake
-- 
GitLab