apps2.0 - port and entrypoint from app config (#5)

* start

* start debug server app with virtual net and port

* preLaunchTask + postDebugTask

* debug tasks done

* entrypoint from app config

.gitignore

@@ -4,4 +4,5 @@ __pycache__
 .idea
 venv
 secret.env
-supervisely_lib
+supervisely_lib
+start.sh

.vscode/launch.json

@@ -9,7 +9,9 @@
             "type": "python",
             "request": "launch",
             "program": "agent/main.py",
-            "console": "integratedTerminal"
+            "console": "integratedTerminal",
+            "preLaunchTask": "create-network",
+            "postDebugTask": "remove-network"
         }
     ]
 }

.vscode/tasks.json

@@ -0,0 +1,33 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+      {
+        "label": "create-network",
+        "type": "shell",
+        "command": "bash",
+        "args": [
+            "-c",
+            "docker network create supervisely-net 2> /dev/null"
+        ],
+        "presentation": {
+          "reveal": "silent",
+          "clear": true
+        }
+      },
+      {
+        "label": "remove-network",
+        "type": "shell",
+        "command": "bash",
+        "args": [
+            "-c",
+            "docker network rm supervisely-net"
+        ],
+        "presentation": {
+          "reveal": "silent",
+          "clear": true
+        }
+      }
+    ]
+  }

agent/worker/task_app.py

@@ -233,7 +233,7 @@ def find_or_run_container(self):
 
     def get_spawn_entrypoint(self):
         inf_command = "while true; do sleep 30; done;"
-        self.logger.info("Infinit command", extra={"command": inf_command})
+        self.logger.info("Infinite command", extra={"command": inf_command})
         return ["sh", "-c", inf_command]
 
     def _exec_command(self, command, add_envs=None, container_id=None):
@@ -259,17 +259,17 @@ def _exec_command(self, command, add_envs=None, container_id=None):
     def exec_command(self, add_envs=None, command=None):
         add_envs = sly.take_with_default(add_envs, {})
         main_script_path = os.path.join(self.dir_task_src_container, self.app_config.get('main_script', 'src/main.py'))
-
         if command is None:
             command = "python {}".format(main_script_path)
+
+        if "entrypoint" in self.app_config:
+            command = f'bash -c "cd {self.dir_task_src_container} && {self.app_config["entrypoint"]}"'
         self.logger.info("command to run", extra={"command": command})
-
         self._exec_command(command, add_envs)
 
         #change pulling progress to app progress
         progress_dummy = sly.Progress('Application is started ...', 1, ext_logger=self.logger)
         progress_dummy.iter_done_report()
-
         self.logger.info("command is running", extra={"command": command})
 
     def install_pip_requirements(self, container_id=None):
@@ -323,6 +323,8 @@ def main_step_envs(self):
 
         if constants.DOCKER_NET() is not None:
             envs['VIRTUAL_HOST'] = f'task-{self.info["task_id"]}.supervisely.local'
+            envs['VIRTUAL_PORT'] = self.app_config.get("port", 8000)
+
         return envs
 
     def process_logs(self):

agent/worker/task_dockerized.py

@@ -146,6 +146,7 @@ def spawn_container(self, add_envs=None, add_labels=None, entrypoint_func=None):
             if add_envs is None:
                 add_envs = {}
             add_envs['VIRTUAL_HOST'] = f'task-{self.info["task_id"]}.supervisely.local'
+            add_envs['VIRTUAL_PORT'] = self.app_config.get("port", 8000)
 
         try:
             self._container = self._docker_api.containers.run(

debug.env

@@ -6,4 +6,5 @@ DOCKER_REGISTRY="in secret.env"
 DOCKER_LOGIN="in secret.env"
 DOCKER_PASSWORD="in secret.env"
 LOG_LEVEL="DEBUG"
-# DISABLE_TELEMETRY="1"
+DISABLE_TELEMETRY="1"
+DOCKER_NET="supervisely-net"