add rc2 to dockerimage path for enterprise registry, add mac os suppo…

…rt for multiprocessing (#4)

* mac os support for multiprocessing

* add rc2 to enterprise dockerimage path

.github/workflows/build-push-dev.yml

@@ -43,7 +43,7 @@ jobs:
           push: true
           tags: |
             supervisely/agent:dev
-            ${{ secrets.DOCKER_ENTERPRISE_REGISTRY }}/agent:dev
+            ${{ secrets.DOCKER_ENTERPRISE_REGISTRY }}/rc2/agent:dev
           build-args: |
             LABEL_VERSION=agent:dev
             LABEL_INFO=${{ env.LABEL_INFO }}

.github/workflows/build-push-release.yml

@@ -45,8 +45,8 @@ jobs:
           tags: |
             supervisely/agent:dev
             supervisely/agent:${{ env.LABEL_VERSION }}
-            ${{ secrets.DOCKER_ENTERPRISE_REGISTRY }}/agent:dev
-            ${{ secrets.DOCKER_ENTERPRISE_REGISTRY }}/agent:${{ env.LABEL_VERSION }}
+            ${{ secrets.DOCKER_ENTERPRISE_REGISTRY }}/rc2/agent:dev
+            ${{ secrets.DOCKER_ENTERPRISE_REGISTRY }}/rc2/agent:${{ env.LABEL_VERSION }}
           build-args: |
             LABEL_VERSION=agent:${{ env.LABEL_VERSION }}
             LABEL_INFO=${{ env.LABEL_INFO }}

agent/main.py

@@ -3,7 +3,6 @@
 import os
 import sys
 from dotenv import load_dotenv
-
 from pathlib import Path
 
 # only for convenient debug, has no effect in production

agent/worker/agent.py

@@ -105,12 +105,12 @@ def agent_connect_initially(self):
         config = json.loads(docker_img_info).get("Config")
         if config is None:
             config = {}
-            self.logger.warn('Agent is running in debug VENV')
+            self.logger.warn('Docker container info unavailable, agent is running in debug VENV')
 
         self.agent_info = {
             'hardware_info': hw_info,
-            'agent_image': config.get("Image", ""),
-            'agent_version': config.get("Labels", {}).get("VERSION", ""),
+            'agent_image': config.get("Image", "docker.enterprise.supervise.ly/agent:6.3.0"), # for debug
+            'agent_version': config.get("Labels", {}).get("VERSION", "agent:6.3.0"),  # for debug
             'agent_image_digest': get_self_docker_image_digest()
         }
 

agent/worker/task_logged.py

@@ -5,6 +5,9 @@
 import threading
 import time
 import multiprocessing
+import platform
+if platform.system() == 'Darwin':
+    multiprocessing.set_start_method("fork")
 import concurrent.futures
 import sys
 import json

debug.env

@@ -1,9 +1,9 @@
-ACCESS_TOKEN="c2msPZoGFl6B4gfjbwt5Y5OrrQ0uJvmr"
-SERVER_ADDRESS="supervisely.private:38585"
+ACCESS_TOKEN="in secret.env"
+SERVER_ADDRESS="in secret.env"
 AGENT_HOST_DIR="/Users/maxim/work/agent/data"
 AGENT_ROOT_DIR="/Users/maxim/work/agent/data"
 DOCKER_REGISTRY="in secret.env"
 DOCKER_LOGIN="in secret.env"
 DOCKER_PASSWORD="in secret.env"
 LOG_LEVEL="DEBUG"
-DISABLE_TELEMETRY="1"
+# DISABLE_TELEMETRY="1"