From b394296954b7bb86a2eac8e72b07d693547631b2 Mon Sep 17 00:00:00 2001
From: Artsiom <artsiomzhuchkou2401@gmail.com>
Date: Wed, 10 May 2023 12:33:57 +0300
Subject: [PATCH] chore: added new version

---
 docker-compose_dev.yml     | 52 --------------------------------------
 release/docker-compose.yml | 28 ++++++++++----------
 2 files changed, 15 insertions(+), 65 deletions(-)
 delete mode 100644 docker-compose_dev.yml

diff --git a/docker-compose_dev.yml b/docker-compose_dev.yml
deleted file mode 100644
index da3c4ec..0000000
--- a/docker-compose_dev.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-version: '3'
-services:
-  tracker_and_sender:
-    restart: always
-    image: artsiom24091/tracker_and_sender:latest
-    build: .
-    container_name: tracker_and_sender
-    ports:
-      - "3011:3011"
-    depends_on:
-      - django
-    environment:
-      CAMERA_URLS: 'rtsp://admin:just4Taqtile@192.168.1.64/h264_stream'
-      CAMERA_TYPES: 'exit entrance'
-    volumes:
-      -  /home/ferrari/reps/server-/images:/var/www/5scontrol/images
-      -  /home/ferrari/reps/server-/dataset/dataset/dataset:/var/www/5scontrol/dataset
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - driver: nvidia
-              count: 1
-              capabilities: [ gpu ]
-  django:
-    restart: always
-    image: artsiom24091/django:latest
-    build: .
-    container_name: django
-    ports:
-      - "80:8000"
-    environment:
-      SECRET_KEY: "django-insecure-osfh^r%nvpun6ek2z4n!f*&r@$g+*d8n#8z0ac9_%)%api0x)7"
-      DEBUG: "True"
-    volumes:
-      -  /home/ferrari/reps/server-/images:/usr/src/app/images
-      -  /home/ferrari/reps/server-/database:/usr/src/app/database
-  face_recognition_queue:
-    restart: always
-    image: artsiom24091/face_recognition_queue:latest
-    build: .
-    container_name: face_recognition_queue
-    environment:
-      - CELERY_BROKER_URL=redis://redis:6379/0
-      - CELERY_RESULT_BACKEND=redis://redis:6379/0
-    ports:
-      - "8008:8008"
-    volumes:
-      -  /home/ferrari/reps/server-/images:/usr/src/app/images
-      -  /home/ferrari/reps/server-/dataset/dataset/dataset:/usr/src/app/dataset
-  redis:
-    image: redis:6-alpine
diff --git a/release/docker-compose.yml b/release/docker-compose.yml
index 56f6173..df08373 100644
--- a/release/docker-compose.yml
+++ b/release/docker-compose.yml
@@ -2,15 +2,17 @@ version: '3'
 services:
   django:
     restart: always
-    image: artsiom24091/django:v0.3.3
+    image: artsiom24091/django:v0.3.4
     build: .
     container_name: django
     environment:
       SECRET_KEY: "0123456789abcdef0123456789abcdef"
       DEBUG: "True"
-      SERVER_URL: "http://192.168.1.150"
-      IP: "192.168.1.150"
+      SERVER_URL: "http://192.168.1.110"
+      IP: "192.168.1.110"
       PRODUCTION: "False"
+      MIN_MAX_PYTHON: "True"
+      IDLE_PYTHON: "True"
     tty: true
     network_mode: host
     volumes:
@@ -29,11 +31,11 @@ services:
       - /home/server/reps/database/pgdata:/var/lib/postgresql/data/
   onvif:
     restart: always
-    image: artsiom24091/onvif:v0.3.2
+    image: artsiom24091/onvif:v0.3.4
     build: .
     container_name: onvif
     environment:
-      IP: "192.168.1.150"
+      IP: "192.168.1.110"
     volumes:
       - /home/server/reps/images:/var/www/5scontrol/images
       - /home/server/reps/videos:/var/www/5scontrol/videos
@@ -51,7 +53,7 @@ services:
       - "3066:3066"   
   algorithms:
     restart: always
-    image: artsiom24091/algorithms:v0.3.2
+    image: artsiom24091/algorithms:v0.3.4
     build: .
     container_name: algorithms
     tty: true
@@ -64,7 +66,7 @@ services:
       -  /home/server/reps/debug:/var/www/5scontrol/debug
   algorithms_torch:
     restart: always
-    image: artsiom24091/algorithms_torch:v0.3.2
+    image: artsiom24091/algorithms_torch:v0.3.4
     build: .
     container_name: algorithms_torch
     tty: true
@@ -72,12 +74,12 @@ services:
     depends_on:
       - django
     volumes:
-      -  /home/server/reps/images:/var/www/5scontrol/images
-      -  /home/server/reps/database/dataset:/var/www/5scontrol/dataset
-      -  /home/server/reps/debug:/var/www/5scontrol/debug
+      - /home/server/reps/images:/var/www/5scontrol/images
+      - /home/server/reps/database/dataset:/var/www/5scontrol/dataset
+      - /home/server/reps/debug:/var/www/5scontrol/debug
   5scontrol_front:
     restart: always
-    image: artsiom24091/5scontrol_front:v0.3.3
+    image: artsiom24091/5scontrol_front:v0.3.4
     build: .
     container_name: 5scontrol_front
     ports:
@@ -90,14 +92,14 @@ services:
     network_mode: host
     tty: true
     environment:
-      IP: "192.168.1.150"
+      IP: "192.168.1.110"
   emulate_operation_control:
     image: nnnxion/emulate_operation_control
     container_name: operation_report_handler
     network_mode: host
     tty: true
     environment:
-      DB_SERVER: "192.168.1.150"
+      DB_SERVER: "192.168.1.110"
       DB_DATABASE: "test"
       DB_USERNAME: "sa"
       DB_PASS: "just4Taqtile"