From 09a9eca12a955d8b114eb0b557fd50b896abdedf Mon Sep 17 00:00:00 2001
From: Laurent <laurent0206.cr@gmail.com>
Date: Tue, 30 Dec 2025 01:55:56 +0100
Subject: [PATCH] Fuck docker

---
 .vscode/settings.json                |  6 ------
 border-router/deploy.sh              |  1 -
 border-router/install.txt            |  1 -
 rpi/Dockerfile                       | 18 ------------------
 rpi/compose.yml                      | 28 ++++++++++++++--------------
 rpi/deploy.sh                        | 13 +++++++++++++
 {border-router => rpi}/otbr-env.list |  0
 rpi/requirements-base.txt            |  3 ---
 rpi/requirements.txt                 | 15 +++++++++++----
 9 files changed, 38 insertions(+), 47 deletions(-)
 delete mode 100644 .vscode/settings.json
 delete mode 100644 border-router/deploy.sh
 delete mode 100644 border-router/install.txt
 delete mode 100644 rpi/Dockerfile
 create mode 100644 rpi/deploy.sh
 rename {border-router => rpi}/otbr-env.list (100%)
 delete mode 100644 rpi/requirements-base.txt

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index fe58ba21..00000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "idf.openOcdConfigs": [
-        "board/esp32s3-builtin.cfg"
-    ],
-    "idf.portWin": "COM3"
-}
\ No newline at end of file
diff --git a/border-router/deploy.sh b/border-router/deploy.sh
deleted file mode 100644
index 8f0ac48a..00000000
--- a/border-router/deploy.sh
+++ /dev/null
@@ -1 +0,0 @@
-docker run --name=otbr --detach --network=host --cap-add=NET_ADMIN --device=/dev/ttyACM0 --device=/dev/net/tun --volume=/var/lib/otbr:/data --env-file=otbr-env.list --restart=always openthread/border-router
\ No newline at end of file
diff --git a/border-router/install.txt b/border-router/install.txt
deleted file mode 100644
index d5147570..00000000
--- a/border-router/install.txt
+++ /dev/null
@@ -1 +0,0 @@
-docker pull openthread/border-router:latest
\ No newline at end of file
diff --git a/rpi/Dockerfile b/rpi/Dockerfile
deleted file mode 100644
index 66122d63..00000000
--- a/rpi/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM python:3.12-slim
-
-WORKDIR /app
-
-COPY requirements-base.txt .
-RUN pip install --no-cache-dir -r requirements-base.txt
-
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-COPY . .
-
-ENV FLASK_APP=app.py
-ENV FLASK_RUN_HOST=0.0.0.0
-ENV FLASK_RUN_PORT=5000
-
-EXPOSE 5000
-CMD ["python", "main.py"]
\ No newline at end of file
diff --git a/rpi/compose.yml b/rpi/compose.yml
index 229b1bb2..b5012484 100644
--- a/rpi/compose.yml
+++ b/rpi/compose.yml
@@ -1,20 +1,20 @@
 version: "3.8"
 
 services:
-  system-api:
-    build: .
-    container_name: "system-api"
-    ports:
-      - "5000:5000"
-    depends_on:
-      - mosquitto
-    environment:
-      - LOCAL_BROKER_USERNAME=system
-      - LOCAL_BROKER_PASSWORD=hepl
-      - LOCAL_BROKER_ADDRESS=system-broker
-      - LOCAL_BROKER_PORT=1883
-      - API_BROKER_ADDRESS=192.168.15.125
-      - API_BROKER_PORT=1883
+  otbr:
+      image: openthread/border-router
+      container_name: otbr
+      network_mode: "host"
+      restart: always
+      cap_add:
+        - NET_ADMIN
+      devices:
+        - /dev/ttyACM0:/dev/ttyACM0
+        - /dev/net/tun:/dev/net/tun
+      volumes:
+        - /var/lib/otbr:/data
+      env_file:
+        - otbr-env.list
 
   mosquitto:
     image: eclipse-mosquitto:latest
diff --git a/rpi/deploy.sh b/rpi/deploy.sh
new file mode 100644
index 00000000..22c4d2ab
--- /dev/null
+++ b/rpi/deploy.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+git pull
+docker compose down
+
+if [ "$1" != "preserve" ]; then
+  docker compose build --no-cache
+fi
+
+docker compose up -d --force-recreate
+
+source ./bin/activate
+python3 ./main.py
\ No newline at end of file
diff --git a/border-router/otbr-env.list b/rpi/otbr-env.list
similarity index 100%
rename from border-router/otbr-env.list
rename to rpi/otbr-env.list
diff --git a/rpi/requirements-base.txt b/rpi/requirements-base.txt
deleted file mode 100644
index fe08839a..00000000
--- a/rpi/requirements-base.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-numpy
-opencv-python
-ultralytics
\ No newline at end of file
diff --git a/rpi/requirements.txt b/rpi/requirements.txt
index fdfeb8c5..994f057a 100644
--- a/rpi/requirements.txt
+++ b/rpi/requirements.txt
@@ -1,8 +1,15 @@
-flask
+python_dateutil
+setuptools
+urllib3
+pydantic
+typing-extensions
 requests
 python-dotenv
-pydantic
-paho-mqtt
 pyyaml
 pyserial
-grovepi
\ No newline at end of file
+opencv-python
+numpy
+ultralytics
+torch
+flask
+paho-mqtt