From e1810554a6f22099c8fc2e071df2fea29017fa03 Mon Sep 17 00:00:00 2001 From: Quentin Roussel Date: Wed, 11 Jan 2023 17:05:59 +0100 Subject: [PATCH] container pour l'interface de la borne --- code/borne/readme.md | 0 .../exemple_overlay_camera.py | 0 code/docker-compose.yaml | 12 +++++++++++- .../assets/img/thumbs_up.png | Bin .../assets/js/camera_editor.js | 0 .../interface => interface_borne}/assets/js/main.js | 0 .../assets/js/network.js | 0 .../{borne/interface => interface_borne}/index.html | 0 code/reviews_api/wait_mysql.sh | 6 ------ 9 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 code/borne/readme.md rename code/{borne/backend => detection_image}/exemple_overlay_camera.py (100%) rename code/{borne/interface => interface_borne}/assets/img/thumbs_up.png (100%) rename code/{borne/interface => interface_borne}/assets/js/camera_editor.js (100%) rename code/{borne/interface => interface_borne}/assets/js/main.js (100%) rename code/{borne/interface => interface_borne}/assets/js/network.js (100%) rename code/{borne/interface => interface_borne}/index.html (100%) delete mode 100644 code/reviews_api/wait_mysql.sh diff --git a/code/borne/readme.md b/code/borne/readme.md deleted file mode 100644 index e69de29..0000000 diff --git a/code/borne/backend/exemple_overlay_camera.py b/code/detection_image/exemple_overlay_camera.py similarity index 100% rename from code/borne/backend/exemple_overlay_camera.py rename to code/detection_image/exemple_overlay_camera.py diff --git a/code/docker-compose.yaml b/code/docker-compose.yaml index 9346d06..cf21243 100644 --- a/code/docker-compose.yaml +++ b/code/docker-compose.yaml @@ -46,4 +46,14 @@ services: depends_on: db: condition: service_healthy - build: ./reviews_api \ No newline at end of file + build: ./reviews_api + restart: always + + interface_borne: + image: httpd:latest + volumes: + - ./interface_borne:/usr/local/apache2/htdocs/ + container_name: interface_borne + ports: + - 80:80 + \ No newline at end of file diff --git a/code/borne/interface/assets/img/thumbs_up.png b/code/interface_borne/assets/img/thumbs_up.png similarity index 100% rename from code/borne/interface/assets/img/thumbs_up.png rename to code/interface_borne/assets/img/thumbs_up.png diff --git a/code/borne/interface/assets/js/camera_editor.js b/code/interface_borne/assets/js/camera_editor.js similarity index 100% rename from code/borne/interface/assets/js/camera_editor.js rename to code/interface_borne/assets/js/camera_editor.js diff --git a/code/borne/interface/assets/js/main.js b/code/interface_borne/assets/js/main.js similarity index 100% rename from code/borne/interface/assets/js/main.js rename to code/interface_borne/assets/js/main.js diff --git a/code/borne/interface/assets/js/network.js b/code/interface_borne/assets/js/network.js similarity index 100% rename from code/borne/interface/assets/js/network.js rename to code/interface_borne/assets/js/network.js diff --git a/code/borne/interface/index.html b/code/interface_borne/index.html similarity index 100% rename from code/borne/interface/index.html rename to code/interface_borne/index.html diff --git a/code/reviews_api/wait_mysql.sh b/code/reviews_api/wait_mysql.sh deleted file mode 100644 index 5b2ebda..0000000 --- a/code/reviews_api/wait_mysql.sh +++ /dev/null @@ -1,6 +0,0 @@ -while ! wget $DB_HOST:3306; -do - sleep 1 - echo "Waiting for database connection..." -done -node index.js \ No newline at end of file