Merge pull request #48 from epics-containers/dev

fix bug with copying into config

Author: gilesknap

src/epics_containers_cli/ioc/local_commands.py

@@ -63,7 +63,7 @@ def _do_deploy(self, ioc_instance: Path, version: str, args: str):
 
         image = get_instance_image_name(ioc_instance)
         log.debug(f"deploying {ioc_instance} with image {image}")
-        config = ioc_instance / CONFIG_FOLDER / "*"
+        config = ioc_instance / CONFIG_FOLDER
         ioc_name = ioc_instance.name
         volume = f"{ioc_name}_config"
 
@@ -83,7 +83,8 @@ def _do_deploy(self, ioc_instance: Path, version: str, args: str):
             f"-v {volume}:/copyto busybox",
             interactive=False,
         )
-        run_command(f"{self.docker.docker} cp {config} {dest}", interactive=False)
+        for file in config.glob("*"):
+            run_command(f"{self.docker.docker} cp {file} {dest}", interactive=False)
         run_command(f"{self.docker.docker} rm -f busybox", interactive=False)
 
         # launch the ioc container with mounted config volume

tests/data/local.yaml

@@ -30,7 +30,7 @@ deploy_local:
     rsp: ""
   - cmd: docker container create --name busybox -v bl45p-ea-ioc-01_config:/copyto busybox
     rsp: ""
-  - cmd: docker cp {data}/iocs/bl45p-ea-ioc-01/config/* busybox:copyto
+  - cmd: docker cp {data}/iocs/bl45p-ea-ioc-01/config/ioc.yaml busybox:copyto
     rsp: ""
   - cmd: docker rm -f busybox
     rsp: ""
@@ -54,7 +54,7 @@ deploy:
     rsp: ""
   - cmd: docker container create --name busybox -v bl45p-ea-ioc-01_config:/copyto busybox
     rsp: ""
-  - cmd: docker cp /tmp/ec_tests/iocs/bl45p-ea-ioc-01/config/* busybox:copyto
+  - cmd: docker cp /tmp/ec_tests/iocs/bl45p-ea-ioc-01/config/ioc.yaml busybox:copyto
     rsp: ""
   - cmd: docker rm -f busybox
     rsp: ""