Update docker compose ansible (#76)

* make torch dockerfile works

* simplify ansible and update docker compose to pull image from gchr

* rollback to main branch

* update with a playbook of debug

* fix docker-compose and add Makefile for deployment

* Update deployment/edge/ansible/Makefile

---------

Co-authored-by: gireg.roussel <gireg.roussel@octo.com>
Co-authored-by: Baptiste O'Jeanson <b.ojeanson@gmail.com>

Author: 3 people

deployment/edge/ansible/Makefile

@@ -18,6 +18,10 @@ ping-inventory:
 deploy-vio-on-inventory:
 	LOCAL_VIO_DIR=${LOCAL_VIO_DIR} ansible-playbook -v -i inventory.ini deploy_vio_on_edge.yml
 
+.PHONY: deploy-vio-on-inventory-from-git-branch ## 🚀 Deploy VIO on the edge devices described in the inventory from a branch to debug
+deploy-vio-on-inventory-from-git-branch:
+	LOCAL_VIO_DIR=${LOCAL_VIO_DIR} ansible-playbook -v -i inventory.ini deploy_vio_on_edge_from_git_branch.yml
+
 .PHONY: register-inventory-on-gcp-hub ## 🚀 Register the inventory on the GCP hub
 register-inventory-on-gcp-hub:
 	LOCAL_VIO_DIR=${LOCAL_VIO_DIR} ansible-playbook -v -i inventory.ini register_edge_on_gcp_hub.yml -e ansible_python_interpreter=.venv/bin/python

deployment/edge/ansible/deploy_vio_on_edge.yml

@@ -1,14 +1,6 @@
 - name: "Deploy vio on edge and launch"
   hosts: all
   tasks:
-    - name: Clone vio git repo
-      ansible.builtin.git:
-        repo: https://github.com/octo-technology/VIO.git
-        dest: "{{ REMOTE_VIO_DIR }}"
-        single_branch: yes
-        version: main
-        force: true
-
     - name: Remove config folder
       ansible.builtin.file:
         path: "{{ REMOTE_VIO_DIR }}/edge_orchestrator/config"
@@ -29,10 +21,15 @@
         src:  "{{ LOCAL_VIO_DIR }}/edge_model_serving/models/tflite"
         dest: "{{ REMOTE_VIO_DIR }}/edge_model_serving/models/"
 
-    - name: Template docker compose
+    - name: Copy docker compose
       ansible.builtin.template:
         src: "{{ LOCAL_VIO_DIR }}/deployment/edge/ansible/files/docker-compose.template.yml"
         dest: "{{ REMOTE_VIO_DIR }}/docker-compose.yml"
+    
+    - name: Copy Makefile
+      ansible.builtin.template:
+        src: "{{ LOCAL_VIO_DIR }}/deployment/edge/ansible/files/Makefile.template"
+        dest: "{{ REMOTE_VIO_DIR }}/Makefile"
 
     - name: Start all edge services on intel (model_serving, orchestrator, interface)
       make:

deployment/edge/ansible/deploy_vio_on_edge_from_git_branch.yml

@@ -0,0 +1,44 @@
+- name: "Deploy vio on edge and launch"
+  hosts: all
+  tasks:
+    - name: Clone vio git repo
+      ansible.builtin.git:
+        repo: https://github.com/octo-technology/VIO.git
+        dest: "{{ REMOTE_VIO_DIR }}"
+        single_branch: yes
+        version: main
+        force: true
+
+    - name: Remove config folder
+      ansible.builtin.file:
+        path: "{{ REMOTE_VIO_DIR }}/edge_orchestrator/config"
+        state: absent
+
+    - name: Copy config on the remote machine
+      ansible.builtin.copy:
+        src:  "{{ LOCAL_VIO_DIR }}/edge_orchestrator/config"
+        dest: "{{ REMOTE_VIO_DIR }}/edge_orchestrator/"
+
+    - name: Remove model folder
+      ansible.builtin.file:
+        path: "{{ REMOTE_VIO_DIR }}/edge_model_serving/models"
+        state: absent
+
+    - name: Copy model file on the remote machine
+      ansible.builtin.copy:
+        src:  "{{ LOCAL_VIO_DIR }}/edge_model_serving/models/tflite"
+        dest: "{{ REMOTE_VIO_DIR }}/edge_model_serving/models/"
+
+    - name: Set environment variables for edge-orchestrator
+      ansible.builtin.set_fact:
+        edge_orchestrator_env:
+          - EDGE_NAME={{ EDGE_NAME }}
+          - SERVING_MODEL_URL=http://edge_model_serving:8501
+          - GOOGLE_APPLICATION_CREDENTIALS=/edge_orchestrator/config/secrets/credentials.json
+          - BUCKET_NAME=tf-vio-bucket
+          - ACTIVE_CONFIG_NAME=marker_classification_with_1_fake_camera
+
+    - name: Start all edge services on intel (model_serving, orchestrator, interface)
+      make:
+        chdir: "{{ REMOTE_VIO_DIR }}"
+        target: vio-edge-up

deployment/edge/ansible/files/Makefile.template

@@ -0,0 +1,20 @@
+SHELL := /bin/bash
+.SHELLFLAGS = -ec
+.ONESHELL:
+.SILENT:
+BUILDOS=$(shell uname -s | tr '[:upper:]' '[:lower:]')
+
+
+.PHONY: help
+help:
+	echo "❓ Use \`make <target>'"
+	grep -E '^\.PHONY: [a-zA-Z0-9_-]+ .*?## .*$$' $(MAKEFILE_LIST) | \
+		awk 'BEGIN {FS = "(: |##)"}; {printf "\033[36m%-30s\033[0m %s\n", $$2, $$3}'
+
+.PHONY: vio-edge-up ## 🐳 Start all edge services (db, model_serving, orchestrator, interface)
+vio-edge-up:
+	BUILDOS=${BUILDOS} docker compose --profile edge up -d
+
+.PHONY: vio-down ## ❌ Stop all services (model_serving, edge_orchestrator, ui)
+vio-down:
+	docker compose --profile hub --profile edge down

deployment/edge/ansible/files/docker-compose.template.yml

@@ -1,11 +1,7 @@
 services:
   edge_model_serving:
     container_name: edge_model_serving
-    build:
-      context: edge_model_serving
-      dockerfile: tflite_serving/Dockerfile
-      args:
-        BUILDOS: ${BUILDOS:-linux}
+    image: ghcr.io/octo-technology/vio/edge_tflite_serving:latest
     environment:
       TF_CPP_MIN_VLOG_LEVEL: 0   # TensorFlow logging level
     ports:
@@ -15,11 +11,7 @@ services:
 
   edge_orchestrator:
     container_name: edge_orchestrator
-    build:
-      context: edge_orchestrator
-      dockerfile: Dockerfile
-      args:
-        BUILDOS: ${BUILDOS:-linux}
+    image: ghcr.io/octo-technology/vio/edge_orchestrator:latest
     volumes:
       - ./config:/edge_orchestrator/config
       - ./data_storage:/edge_orchestrator/data_storage
@@ -32,19 +24,16 @@ services:
       GOOGLE_APPLICATION_CREDENTIALS: /edge_orchestrator/config/secrets/credentials.json
       BUCKET_NAME: tf-vio-bucket
       ACTIVE_CONFIG_NAME: marker_classification_with_1_fake_camera
+    privileged: true
 
   edge_interface:
     container_name: edge_interface
-    build:
-      context: edge_interface
-      dockerfile: Dockerfile
+    image: ghcr.io/octo-technology/vio/edge_interface:latest
     ports:
       - 8080:80
 
   edge_streamlit:
     container_name: edge_streamlit
-    build:
-      context: edge_streamlit
-      dockerfile: Dockerfile
+    image: ghcr.io/octo-technology/vio/edge_streamlit:latest
     ports:
       - 8502:8502