example.container: Update example config with volume mount options

Volumes can be mounted with some different flags or no flags at all.
Since converting the string into an object would be overkill, as most of
the time the default options should suffice, and branching in
Volumes.from_json() to handle both strings and objects is also no the
cleanest method, implement it by using what already exists. Mount points
are not checked by the script, so the mount options can just be added to
the CONTAINER-DIR part of the volume config.

Signed-off-by: Enno Tensing <tenno@suij.in>

containerrc.json

@@ -101,19 +101,8 @@
       ]
     },
     "env": {
-      "type": "object",
+      "type": "object"
-      "properties": {
+      }
-        "FOO": {
-          "type": "string"
-        },
-        "MAN_WIDTH": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "FOO",
-        "MAN_WIDTH"
-      ]
     },
     "secrets": {
       "type": "object"
@@ -149,18 +138,6 @@
   },
   "required": [
     "name",
-    "image",
+    "image"
-    "privileged",
-    "read_only",
-    "replace",
-    "pull_policy",
-    "restart",
-    "network",
-    "dns",
-    "ports",
-    "env",
-    "secrets",
-    "volumes",
-    "capabilities"
   ]
-}
+}

example.container

@@ -42,7 +42,7 @@
 		}
 	},
 	"volumes": {
-		"etc": "/etc",
+		"etc": "/etc:ro,noexec",
 		"var": "/var"
 	},
 	"capabilities": {

generate/container.py

@@ -72,7 +72,7 @@ class Volume:
         cmd = f"# Create volume {self.name}\n"
         cmd += f"if ! podman volume exists '{self.name}' 2> /dev/null\n"
         cmd += "then\n"
-        cmd += "\tpodman volume create '{self.name}'\n"
+        cmd += f"\tpodman volume create '{self.name}'\n"
         cmd += "fi\n"
         return cmd
 
@@ -123,7 +123,9 @@ class Secret:
     def command(self) -> str:
         """Option for podman container create."""
         cmd = (
-            f"--secret {self.name},type={self.secret_type},target={self.target}"
+                f"--secret {self.name},:"
+                f"type={self.secret_type},"
+                f"target={self.target}"
         )
         # Not a password, ruff...
         if self.secret_type == "mount" and self.options != "":  # noqa: S105
@@ -188,7 +190,7 @@ class Environment:
         cmd = f"# Remove env-file {self.file}\n"
         cmd += f"if [ -e '{self.file}' ]\n"
         cmd += "then\n"
-        cmd += "\trm '{self.file}'\n"
+        cmd += f"\trm '{self.file}'\n"
         cmd += "fi\n"
         return cmd
 

generate/generate.py

@@ -14,6 +14,14 @@ from pathlib import Path
 from container import ConfigError, Container
 from log import Log
 
+GENERATE_VERSION = "0.0.2"
+HEADER = f"""#!/bin/sh
+# This script was generated by containerctl v{GENERATE_VERSION}
+# Report bugs with _this script_ to <tenno+containerctl@suij.in>
+
+
+"""
+
 
 def load_container_config(file: Path, log: Log) -> dict | None:
     """Load a container config."""
@@ -98,13 +106,17 @@ def main() -> None:
         Path(base).mkdir()
     for script, method in scripts.items():
         s = Path(f"{base}/{script}")
+        script_content = ""
+        if script == "create":
+            script_content += ct.create_volumes()
+            script_content += ct.create_secrets()
+            script_content += ct.create_environment()
+        script_content += method()
+        if script_content == "":
+            script_content = "true"
         with s.open("w+", encoding="utf-8") as f:
-            f.write("#!/bin/sh\n")
+            f.write(HEADER)
-            if script == "create":
+            f.write(script_content)
-                f.write(ct.create_volumes())
-                f.write(ct.create_secrets())
-                f.write(ct.create_environment())
-            f.write(method())
         s.chmod(
             stat.S_IRWXU
             | stat.S_IRGRP