services: mk host volume with user before docker does with root

Author: pinheadmz

Diff for: src/backends/compose/compose_backend.py

@@ -457,7 +457,12 @@ def get_service_container_name(self, service_name: str):
     def service_from_json(self, service_name: str) -> object:
         obj = services[service_name]
         volumes = obj.get("volumes", [])
-        volumes += [f"{self.config_dir}" + filepath for filepath in obj.get("config_files", [])]
+        for bind_mount in obj.get("config_files", []):
+            volume_name, mount_path = bind_mount.split(":")
+            hostpath = self.config_dir / volume_name
+            # Create the directory now so it has python-user permissions not docker-root
+            hostpath.mkdir(parents=True, exist_ok=True)
+            volumes += [f"{hostpath}:{mount_path}"]
 
         ports = []
         if "container_port" and "warnet_port" in obj:

Diff for: src/backends/kubernetes/kubernetes_backend.py

@@ -721,7 +721,6 @@ def service_from_json(self, obj):
         volumes = []
         for vol in obj.get("config_files", []):
             volume_name, mount_path = vol.split(":")
-            volume_name = volume_name.replace("/", "")
             volume_mounts.append(client.V1VolumeMount(name=volume_name, mount_path=mount_path))
             volumes.append(client.V1Volume(name=volume_name, empty_dir=client.V1EmptyDirVolumeSource()))
 

Diff for: src/warnet/services.py

@@ -31,7 +31,7 @@
         "container_name_suffix": "fork-observer",
         "warnet_port": "23001",
         "container_port": "2323",
-        "config_files": [f"/{FO_CONF_NAME}:/app/config.toml"],
+        "config_files": [f"{FO_CONF_NAME}:/app/config.toml"],
     },
     "grafana": {
         "backends": ["compose"],
@@ -43,8 +43,8 @@
             "grafana-storage:/var/lib/grafana"
         ],
         "config_files": [
-            f"/{GRAFANA_PROVISIONING}/datasources:/etc/grafana/provisioning/datasources",
-            f"/{GRAFANA_PROVISIONING}/dashboards:/etc/grafana/provisioning/dashboards",
+            f"{GRAFANA_PROVISIONING}/datasources:/etc/grafana/provisioning/datasources",
+            f"{GRAFANA_PROVISIONING}/dashboards:/etc/grafana/provisioning/dashboards",
         ],
         "environment": [
             "GF_LOG_LEVEL=debug",
@@ -76,7 +76,7 @@
         "container_name_suffix": "prometheus",
         "warnet_port": "23004",
         "container_port": "9090",
-        "config_files": [f"/{PROM_CONF_NAME}:/etc/prometheus/prometheus.yml"],
+        "config_files": [f"{PROM_CONF_NAME}:/etc/prometheus/prometheus.yml"],
         "args": ["--config.file=/etc/prometheus/prometheus.yml"]
     },
     "simln": {
@@ -87,6 +87,6 @@
             "LOG_LEVEL=debug",
             "SIMFILE_PATH=/simln/sim.json"
         ],
-        "config_files": ["/simln:/simln"]
+        "config_files": ["simln:/simln"]
     },
 }