feat:update version

5sControl · Sep 13, 2023 · cad09aa · cad09aa
1 parent c038f5b
commit cad09aa
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 16 deletions.
diff --git a/.Makefile.swp b/.Makefile.swp
diff --git a/deploy.sh b/deploy.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+DJANGO_URL="[email protected]:5sControl/5sControll-backend-django.git"
+DJANGO_IMAGE_NAME="artsiom24091/django"
+
+FRONT_URL="[email protected]:5sControl/django-front.git"
+FRONT_IMAGE_NAME="artsiom24091/5scontrol_front"
+
+ALGORITHMS_URL="[email protected]:5sControl/algorithms.git"
+ALGORITHMS_IMAGE_NAME="artsiom24091/algorithms"
+
+ONVIF_URL="[email protected]:5sControl/onvif.git"
+ONVIF_IMAGE_NAME="artsiom24091/onvif"
+
+while true; do
+    is_changes=0
+
+    #  check django
+    cd ../5sControll-backend-django/
+    git fetch
+    if ! git diff --quiet HEAD origin/main; then
+        git pull
+        sudo docker build -t $DJANGO_IMAGE_NAME .
+        cd ../server-/
+        sudo docker-compose down && sudo docker-compose up --detach
+        is_changes=1
+    fi
+
+    #  check front
+    cd ../django-front/
+    git fetch
+    if ! git diff --quiet HEAD origin/development; then
+        git pull
+        sudo docker build -t $FRONT_IMAGE_NAME .
+        cd ../server-/
+        sudo docker-compose down && sudo docker-compose up --detach
+        is_changes=1
+    fi
+
+    #  check algorithms
+    cd ../algorithms/
+    git fetch
+    if ! git diff --quiet HEAD origin/main; then
+        git pull
+        sudo docker build -t $ALGORITHMS_IMAGE_NAME .
+        cd ../server-/
+        is_changes=1
+    fi
+
+    # onvif
+    cd ../onvif/
+    git fetch
+    if ! git diff --quiet HEAD origin/main; then
+        git pull
+        sudo docker build -t $ONVIF_IMAGE_NAME .
+        cd ../server-/
+        is_changes=1
+    fi
+
+    if [ $is_changes -eq 0 ]; then
+        echo "No changes"
+    else
+	echo "Update"
+	sudo docker-compose down && sudo docker-compose up --detach
+    fi
+
+    sleep 10
+done
+
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -96,7 +96,7 @@ services:
           memory: 4000M
   machine_js_model:
     restart: always
-    image: 5scontrol/inference_server_js:v0.1.0
+    image: 5scontrol/inference_server_js:v0.2.0
     container_name: machine_js_model
     tty: true
     network_mode: host
@@ -106,6 +106,9 @@ services:
       resources:
         limits:
           memory: 4000M
+    volumes:
+      - /home/server/reps/images:/var/www/5scontrol/images
+      - /home/server/reps/debug:/var/www/5scontrol/debug
   idle_model:
     restart: always
     image: 5scontrol/idle_python_server:v0.5.0

diff --git a/release/Makefile b/release/Makefile
@@ -6,4 +6,4 @@ run:
 	sudo mkdir -p /home/server/reps/database/
 	sudo mkdir -p /home/server/reps/database/pgdata
 	sudo mkdir -p /home/server/reps/debug
-	sudo docker pull 5scontrol/machine_control_python:v1.3.1 && sudo docker pull 5scontrol/operation_control_js:v1.0.0-rc.7 && sudo docker pull 5scontrol/min_max_python:v0.5.0 && sudo docker pull 5scontrol/idle_python:v0.5.0 && sudo docker pull 5scontrol/machine_control_js:v0.3.0 && sudo docker-compose pull && sudo docker-compose up
+	sudo docker pull 5scontrol/machine_control_python:v1.3.2 && sudo docker pull 5scontrol/operation_control_js:v1.0.0-rc.7 && sudo docker pull 5scontrol/min_max_python:v0.5.2 && sudo docker pull 5scontrol/idle_python:v0.5.0 && sudo docker pull 5scontrol/machine_control_js:v0.4.0 && sudo docker-compose pull && sudo docker-compose up
diff --git a/release/docker-compose.yml b/release/docker-compose.yml
@@ -62,23 +62,31 @@ services:
     stdin_open: true
   min_max_model:
     restart: always
-    image: 5scontrol/min_max_python-server:v0.5.0
+    image: 5scontrol/min_max_python-server:v0.5.2
     container_name: min_max_model
     tty: true
     network_mode: host
     environment:
       server_url: '192.168.1.184'
+    deploy:
+      resources:
+        limits:
+          memory: 3000M
   machine_model:
     restart: always
-    image: 5scontrol/machine_control_python_model_server:v1.0.2
+    image: 5scontrol/machine_control_python_model_server:v1.0.3
     container_name: machine_model
     tty: true
     network_mode: host
     environment:
       server_url: '192.168.1.184'
+    deploy:
+      resources:
+        limits:
+          memory: 3000M
   machine_js_model:
     restart: always
-    image: 5scontrol/inference_server_js:v0.1.0
+    image: 5scontrol/inference_server_js:v0.2.0
     container_name: machine_js_model
     tty: true
     network_mode: host
@@ -87,7 +95,9 @@ services:
     deploy:
       resources:
         limits:
-          cpus: '1'
+          memory: 3000M
+    volumes:
+      - /home/server/reps/images:/var/www/5scontrol/images
   idle_model:
     restart: always
     image: 5scontrol/idle_python_server:v0.5.0
@@ -96,6 +106,10 @@ services:
     network_mode: host
     environment:
       server_url: '192.168.1.184'
+    deploy:
+      resources:
+        limits:
+          memory: 3000M
   5scontrol_front:
     restart: always
     image: 5scontrol/5scontrol_front:v0.5.2
@@ -111,16 +125,6 @@ services:
     tty: true
     environment:
       IP: '192.168.1.184'
-  emulate_operation_control:
-    image: nnnxion/emulate_operation_control
-    container_name: operation_report_handler
-    network_mode: host
-    tty: true
-    environment:
-      DB_SERVER: '192.168.1.110'
-      DB_DATABASE: 'test'
-      DB_USERNAME: 'sa'
-      DB_PASS: 'just4Taqtile'
   redis:
     image: redis
     container_name: redis