Merge pull request #38 from epics-containers/dev

fix volume not full path error

Author: gilesknap

src/epics_containers_cli/dev/dev_commands.py

@@ -9,7 +9,7 @@
 from epics_containers_cli.git import get_git_name, get_image_name
 from epics_containers_cli.logging import log
 from epics_containers_cli.shell import EC_CONTAINER_CLI, run_command
-from epics_containers_cli.utils import get_instance_image_name
+from epics_containers_cli.utils import check_ioc_instance_path, get_instance_image_name
 
 from ..globals import (
     CONFIG_FOLDER,
@@ -188,9 +188,12 @@ def launch(
             f" execute={execute} target={target} args={args}"
         )
 
-        mounts = [f"-v {ioc_instance}/{CONFIG_FOLDER}:{IOC_CONFIG_FOLDER}"]
+        ioc_name_std, ioc_path = check_ioc_instance_path(ioc_instance)
+        ioc_name = ioc_name or ioc_name_std
 
-        image_name = image or get_instance_image_name(ioc_instance, tag)
+        mounts = [f"-v {ioc_path}/{CONFIG_FOLDER}:{IOC_CONFIG_FOLDER}"]
+
+        image_name = image or get_instance_image_name(ioc_path, tag)
 
         self._do_launch(ioc_name, target, image_name, execute, args, mounts)
 

tests/data/ioc.yaml

@@ -14,7 +14,7 @@ delete:
 
 template:
   - cmd: 'bash -c "helm template bl45p-ea-ioc-01 /tmp/ec_tests/beamline-chart --version
-      20.*--namespace bl45p -f .*\/data\/iocs\/bl45p-ea-ioc-01\/values.yaml.*'
+      20.*--namespace bl45p -f \/.*\/data\/iocs\/bl45p-ea-ioc-01\/values.yaml.*'
     rsp: |
       # Source: bl45p-ea-ioc-01/templates/configmap.yaml
       apiVersion: v1
@@ -23,7 +23,7 @@ template:
 # TODO blank response is that OK?
 deploy_local:
   - cmd: 'bash -c "helm upgrade --install bl45p-ea-ioc-01 /tmp/ec_tests/beamline-chart
-      --version 20.*--namespace bl45p -f .*\/data\/iocs\/bl45p-ea-ioc-01\/values.yaml.*'
+      --version 20.*--namespace bl45p -f \/.*\/data\/iocs\/bl45p-ea-ioc-01\/values.yaml.*'
     rsp: ""
 
 deploy:

tests/data/local.yaml

@@ -17,7 +17,7 @@ deploy_local:
     rsp: bl45p-ea-ioc-01-config
   - cmd: docker run -dit --net host --restart unless-stopped -l is_IOC=true -l version=.* -v bl45p-ea-ioc-01_config:\/epics\/ioc\/config\/  --name bl45p-ea-ioc-01 ghcr.io\/epics-containers\/ioc-adaravis-linux-runtime:23.9.4
     rsp: True
-  - cmd: docker cp .*epics-containers-cli\/tests\/data\/iocs\/bl45p-ea-ioc-01\/config\/\* bl45p-ea-ioc-01:\/epics\/ioc\/config\/
+  - cmd: docker cp \/.*epics-containers-cli\/tests\/data\/iocs\/bl45p-ea-ioc-01\/config\/\* bl45p-ea-ioc-01:\/epics\/ioc\/config\/
     rsp: 32123f4d0b0f
 
 deploy: