change file to dir in mount

supervisely · Oct 2, 2023 · ed1b8f4 · ed1b8f4
1 parent 988f202
commit ed1b8f4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/agent/worker/constants.py b/agent/worker/constants.py
@@ -397,6 +397,11 @@ def APP_DEBUG_DOCKER_IMAGE():
 def REQUESTS_CA_BUNDLE():
     return read_optional_setting(_REQUESTS_CA_BUNDLE)
 
+def REQUESTS_CA_BUNDLE_DIR():
+    if REQUESTS_CA_BUNDLE() is not None:
+        return os.path.dirname(REQUESTS_CA_BUNDLE())
+    return None
+
 
 def MOUNTED_REQUESTS_CA_BUNDLE():
     return os.path.join(AGENT_ROOT_DIR(), "certs")
@@ -508,7 +513,7 @@ def init_constants():
         sly.fs.mkdir(SUPERVISELY_SYNCED_APP_DATA_CONTAINER())
 
     if REQUESTS_CA_BUNDLE() is not None:
-        if os.path.dirname(REQUESTS_CA_BUNDLE()) != MOUNTED_REQUESTS_CA_BUNDLE():
+        if REQUESTS_CA_BUNDLE_DIR() != MOUNTED_REQUESTS_CA_BUNDLE():
             filename = sly.fs.get_file_name_with_ext(REQUESTS_CA_BUNDLE())
             sly.fs.mkdir(MOUNTED_REQUESTS_CA_BUNDLE())
             sly.fs.copy_file(

diff --git a/agent/worker/task_app.py b/agent/worker/task_app.py
@@ -292,16 +292,10 @@ def _get_task_volumes(self):
 
         if constants.REQUESTS_CA_BUNDLE() is not None:
             res[constants.MOUNTED_HOST_REQUESTS_CA_BUNDLE()] = {
-                "bind": constants.REQUESTS_CA_BUNDLE(),
+                "bind": constants.REQUESTS_CA_BUNDLE_DIR(),
                 "mode": "ro",
             }
 
-        # if constants.HOST_REQUESTS_CA_BUNDLE() is not None: # "${AGENT_HOST_DIR}"/certs
-        #     res[constants.HOST_REQUESTS_CA_BUNDLE()] = {
-        #         "bind": constants.REQUESTS_CA_BUNDLE(),  # /sly_agent/certs
-        #         "mode": "ro",
-        #     }
-
         if constants.SUPERVISELY_AGENT_FILES() is not None:
             relative_app_data_dir = os.path.join(
                 "app_data", slugify(self.app_config["name"]), str(self.info["task_id"])

diff --git a/agent/worker/task_dockerized.py b/agent/worker/task_dockerized.py
@@ -150,14 +150,10 @@ def _get_task_volumes(self):
         }
         if constants.REQUESTS_CA_BUNDLE() is not None:
             volumes[constants.MOUNTED_HOST_REQUESTS_CA_BUNDLE()] = {
-                "bind": constants.REQUESTS_CA_BUNDLE(),
+                "bind": constants.REQUESTS_CA_BUNDLE_DIR(),
                 "mode": "ro",
             }
-        # if constants.HOST_REQUESTS_CA_BUNDLE() is not None:
-        #     volumes[constants.HOST_REQUESTS_CA_BUNDLE()] = {
-        #         "bind": constants.REQUESTS_CA_BUNDLE(),
-        #         "mode": "ro",
-        #     }
+
         return volumes
 
     def get_spawn_entrypoint(self):