edge-containers-cli 3.5.3__tar.gz → 3.5.5__tar.gz

{edge_containers_cli-3.5.3 → edge_containers_cli-3.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edge-containers-cli
-Version: 3.5.3
+Version: 3.5.5
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License

{edge_containers_cli-3.5.3 → edge_containers_cli-3.5.5}/src/edge_containers_cli/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.5.3'
-__version_tuple__ = version_tuple = (3, 5, 3)
+__version__ = version = '3.5.5'
+__version_tuple__ = version_tuple = (3, 5, 5)

{edge_containers_cli-3.5.3 → edge_containers_cli-3.5.5}/src/edge_containers_cli/cmds/k8s_commands.py

@@ -194,7 +194,9 @@ class K8sCommands(Commands):
                 has_header=False,
                 new_columns=["name", "running", "restarts"],
             )
-            services_df = services_df.join(gtpo_df, on="name", how="left")
+            services_df = services_df.join(
+                gtpo_df, on="name", how="left", coalesce=True
+            )
             services_df = services_df.with_columns(
                 polars.col("running").replace({"Running": True}, default=False),
                 polars.col("restarts").fill_null(0),
@@ -214,7 +216,7 @@ class K8sCommands(Commands):
         helm_df = polars.read_json(StringIO(str(helm_out)))
         helm_df = helm_df.rename({"app_version": "version", "updated": "deployed"})
         helm_df = helm_df.with_columns(polars.col("deployed").str.slice(0, 19))
-        services_df = services_df.join(helm_df, on="name", how="left")
+        services_df = services_df.join(helm_df, on="name", how="left", coalesce=True)
         log.debug(services_df)
 
         # Arrange columns

{edge_containers_cli-3.5.3 → edge_containers_cli-3.5.5}/src/edge_containers_cli/cmds/local_commands.py

@@ -10,6 +10,7 @@ tool like Portainer is a decent workflow.
 """
 
 import json
+import os
 import re
 import tempfile
 from datetime import datetime
@@ -65,6 +66,14 @@ class LocalCommands(Commands):
             raise typer.Abort()
         self.docker.remove(service_name)
 
+    def make_volume(self, volume: str):
+        shell.run_command(
+            f"{self.docker.docker} volume rm -f {volume}", interactive=False
+        )
+        shell.run_command(
+            f"{self.docker.docker} volume create {volume}", interactive=False
+        )
+
     def _do_deploy(self, ioc_instance: Path, version: str, args: str):
         service_name, _ = check_instance_path(ioc_instance)
 
@@ -72,26 +81,40 @@ class LocalCommands(Commands):
         log.debug(f"deploying {ioc_instance} with image {image}")
         config = ioc_instance / globals.CONFIG_FOLDER
         service_name = ioc_instance.name
-        volume = f"{service_name}_config"
+        config_volume = f"{service_name}_config"
+        runtime_volume = f"{service_name}_runtime"
 
         self.docker.remove(service_name)
-        shell.run_command(
-            f"{self.docker.docker} volume rm -f {volume}", interactive=False
-        )
-        shell.run_command(
-            f"{self.docker.docker} volume create {volume}", interactive=False
-        )
+        self.make_volume(config_volume)
+        self.make_volume(runtime_volume)
 
-        vol = f"-v {volume}:{globals.IOC_CONFIG_FOLDER}"
+        vol = f"-v {config_volume}:{globals.IOC_CONFIG_FOLDER}"
+        vol = vol + f" -v {runtime_volume}:{globals.IOC_RUNTIME_FOLDER}"
         label = f"-l is_IOC=true -l version={version}"
-        cmd = f"run -dit --net host --restart unless-stopped {label} {vol} {args}"
         dest = "busybox:copyto"
 
+        # use environment to configure volumes and user id
+        data_folder = os.getenv("EC_LOCAL_DATA_FOLDER")
+        if data_folder:
+            vol = vol + f" -v {data_folder}:{data_folder}"
+        opi_folder = os.getenv("EC_LOCAL_OPI_FOLDER")
+        if opi_folder:
+            vol = vol + f" -v {opi_folder}:/epics/opi"
+
+        user_id = os.getenv("EC_LOCAL_USER_ID")
+        ids = f"-u {user_id}" if user_id else ""
+        group_id = os.getenv("EC_LOCAL_GROUP_ID")
+        if group_id:
+            cmd = f"{ids} -g {group_id}"
+
+        cmd = f"run -dit --net host --restart unless-stopped {label} {vol} {args} {ids}"
+        cmd = cmd.strip()
+
         # get the config into the volume before launching the IOC container
         shell.run_command(f"{self.docker.docker} rm -f busybox", interactive=False)
         shell.run_command(
             f"{self.docker.docker} container create --name busybox "
-            f"-v {volume}:/copyto busybox",
+            f"-v {config_volume}:/copyto busybox",
             interactive=False,
         )
         for file in config.glob("*"):

{edge_containers_cli-3.5.3 → edge_containers_cli-3.5.5}/src/edge_containers_cli/globals.py

@@ -21,6 +21,8 @@ SHARED_CHARTS_FOLDER = "../../helm"
 CONFIG_FOLDER = "config"
 # location of IOC Instance configuration inside a Generic IOC container
 IOC_CONFIG_FOLDER = "/epics/ioc/config/"
+# location of IOC Instance configuration inside a Generic IOC container
+IOC_RUNTIME_FOLDER = "/epics/runtime/"
 # file name of IOC Instance ibek configuration inside a Generic IOC container
 CONFIG_FILE_GLOB = "*.yaml"
 # namespace name for deploying IOC instances into the local podman/docker

{edge_containers_cli-3.5.3 → edge_containers_cli-3.5.5}/src/edge_containers_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edge-containers-cli
-Version: 3.5.3
+Version: 3.5.5
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License

{edge_containers_cli-3.5.3 → edge_containers_cli-3.5.5}/tests/data/local.yaml

@@ -26,6 +26,10 @@ deploy_local:
     rsp: bl01t-ea-test-01-config
   - cmd: docker volume create bl01t-ea-test-01_config
     rsp: bl01t-ea-test-01-config
+  - cmd: docker volume rm -f bl01t-ea-test-01_runtime
+    rsp: bl01t-ea-test-01-config
+  - cmd: docker volume create bl01t-ea-test-01_runtime
+    rsp: bl01t-ea-test-01-config
   - cmd: docker rm -f busybox
     rsp: ""
   - cmd: docker container create --name busybox -v bl01t-ea-test-01_config:/copyto busybox
@@ -37,7 +41,7 @@ deploy_local:
     rsp: ""
   - cmd: docker rm -f busybox
     rsp: ""
-  - cmd: docker run -dit --net host --restart unless-stopped -l is_IOC=true -l version=.* -v bl01t-ea-test-01_config:\/epics\/ioc\/config\/  --name bl01t-ea-test-01 ghcr.io\/epics-containers\/ioc-adsimdetector-runtime:2024.4.1
+  - cmd: docker run -dit --net host --restart unless-stopped -l is_IOC=true -l version=.* -v bl01t-ea-test-01_config:\/epics\/ioc\/config\/ -v bl01t-ea-test-01_runtime:/epics/runtime/ --name bl01t-ea-test-01 ghcr.io\/epics-containers\/ioc-adsimdetector-runtime:2024.4.1
     rsp: True
   - cmd: docker ps -f name=bl01t-ea-test-01 --format .*
     rsp: bl01t-ea-test-01
@@ -53,6 +57,10 @@ deploy:
     rsp: bl01t-ea-test-01-config
   - cmd: docker volume create bl01t-ea-test-01_config
     rsp: bl01t-ea-test-01-config
+  - cmd: docker volume rm -f bl01t-ea-test-01_runtime
+    rsp: bl01t-ea-test-01-config
+  - cmd: docker volume create bl01t-ea-test-01_runtime
+    rsp: bl01t-ea-test-01-config
   - cmd: docker rm -f busybox
     rsp: ""
   - cmd: docker container create --name busybox -v bl01t-ea-test-01_config:/copyto busybox
@@ -64,7 +72,7 @@ deploy:
     rsp: ""
   - cmd: docker rm -f busybox
     rsp: ""
-  - cmd: docker run -dit --net host --restart unless-stopped -l is_IOC=true -l version=2.0 -v bl01t-ea-test-01_config:/epics/ioc/config/  --name bl01t-ea-test-01 ghcr.io/epics-containers/ioc-adsimdetector-runtime:2024.4.1
+  - cmd: docker run -dit --net host --restart unless-stopped -l is_IOC=true -l version=2.0 -v bl01t-ea-test-01_config:/epics/ioc/config/ -v bl01t-ea-test-01_runtime:/epics/runtime/ --name bl01t-ea-test-01 ghcr.io/epics-containers/ioc-adsimdetector-runtime:2024.4.1
     rsp: True
   - cmd: docker ps -f name=bl01t-ea-test-01 --format .*
     rsp: bl01t-ea-test-01