containerctl

@@ -17,22 +17,28 @@ get_python_path()
 	pyver="$(/usr/bin/env "${py}" -c 'import sys; print(sys.version_info.minor)')"
 	if [ "${pyver}" -lt "11" ]
 	then
-		pyver="13"
-		py="python3.${pyver}"
+		py="python3.13"
 	else
 		printf '%b' "${py}"
 		return
 	fi
 
-	while [ "${pyver}" -ge 11 ]
-	do
-		if /usr/bin/env "${py}" -c "print('${py}')" 2> /dev/null
-		then
-			return
-		fi
-		pyver=$((pyver - 1))
-		py="python3.${pyver}"
-	done
+	if /usr/bin/env "${py}" 2> /dev/null
+	then
+		return
+	fi
+
+	py="python3.12"
+	if /usr/bin/env "${py}" 2> /dev/null
+	then
+		return
+	fi
+
+	py="python3.11"
+	if /usr/bin/env "${py}" 2> /dev/null
+	then
+		return
+	fi
 
 	log_error 'containerctl needs at least Python 3.11 to run!'
 	exit 1

generate/container.py

@@ -186,7 +186,6 @@ class Memory:
         reservation = maybe_or(val, "reservation", "")
         swap = maybe_or(val, "swap", "")
         if limit == "":
-            logger.log_warning("No limit set, memory config is not needed")
             return cls("", "", "")
         return cls(limit, reservation, swap)
 
@@ -253,7 +252,7 @@ class Volume:
         if val is None:
             return []
         if not isinstance(val, dict):
-            logger.log_warning("Volume key is malformed.")
+            logger.log_warning("Volume key is present, but malformed.")
             return []
         return [
             Volume.from_json_entry(key, value) for key, value in val.items()
@@ -320,7 +319,7 @@ class Secret:
         if val is None:
             return []
         if not isinstance(val, dict):
-            logger.log_warning("Secret key is malformed!")
+            logger.log_warning("Secret key is present, but malformed!")
             return []
         secrets = []
         for key in val:
@@ -333,9 +332,6 @@ class Secret:
             if isinstance(target, str):
                 target = [target]
             if not isinstance(target, list):
-                logger.log_warning(
-                        f"Secret {name} has no target and will be ignored"
-                        )
                 target = []
             options = maybe_or(val[key], "options", "")
             if options is None:
@@ -397,7 +393,7 @@ class Environment:
         if val is None:
             return cls([], "")
         if not isinstance(val, dict):
-            logger.log_warning("Environment key is malformed!")
+            logger.log_warning("Environment key is present, but malformed!")
             return cls([], "")
         return cls([f"{key}='{value}'" for key, value in val.items()], "")
 
@@ -444,7 +440,7 @@ class Ports:
         if val is None:
             return cls([], [])
         if not isinstance(val, dict):
-            logger.log_warning("Ports key is malformed!")
+            logger.log_warning("Ports key is present, but malformed!")
             return cls([], [])
         tcp_ports = maybe(val, "tcp")
         udp_ports = maybe(val, "udp")
@@ -503,13 +499,13 @@ class Network:
             return cls("", [])
         mode = maybe(val, "mode")
         options = maybe(val, "options")
-        if mode is None or not isinstance(mode, str):
+        if mode is None:
             err = "Network configuration is missing or has malformed elements!"
             logger.log_error(err)
             return cls("", [])
         if options is None or not isinstance(options, list):
-            return cls(mode, [])
-        return cls(mode, options)
+            return cls(str(mode), [])
+        return cls(str(mode), options)
 
     def command(self) -> str:
         """Option for podman container create."""
@@ -541,7 +537,7 @@ class Image:
         image = maybe_or(val, "image", "")
         tag = maybe_or(val, "tag", "")
         cmd = maybe_or(val, "command", "")
-        return cls(registry, image, tag, cmd)
+        return cls(str(registry), str(image), str(tag), cmd)
 
     def command(self) -> str:
         """Option for podman container create."""
@@ -593,9 +589,9 @@ class Dns:
         search = maybe_or(val, "search", "")
         servers = maybe(val, "servers")
         if not isinstance(servers, list):
-            logger.log_warning("Servers key is not an array!")
-            return cls([], search)
-        return cls(servers, search)
+            logger.log_error("Servers key is not an array!")
+            return cls([], "")
+        return cls(servers, str(search))
 
     def command(self) -> str:
         """Option for podman container create."""
@@ -720,30 +716,14 @@ class Container:
         name = maybe(json, "name")
         if name is None:
             logger.log_error("No container name set, aborting!")
-            raise ConfigError("Container has no name")
+            return
         image = maybe(json, "image")
         if image is None:
             logger.log_error("No image set, aborting!")
-            raise ConfigError("Container has no image")
-
-        self.image = Image.from_json(image, logger)
-        image_valid = True
-        if self.image.image == "":
-            logger.log_error("Image has no image set!")
-            image_valid = False
-        if self.image.registry == "":
-            logger.log_error("Image has no registry set!")
-            image_valid = False
-        if self.image.tag == "":
-            logger.log_error("Image has no tag set!")
-            image_valid = False
-        if not image_valid:
-            raise ConfigError("Image is missing required keys!")
-
-        self.name = name
+            return
         ct_opts = ContainerOptions.from_json(json, logger)
         if not ct_opts.is_valid:
-            raise ConfigError("Config seems to be invalid?")
+            return
         env = maybe(json, "env")
         secrets = maybe(json, "secrets")
         volumes = maybe(json, "volumes")

generate/generate.py

@@ -14,7 +14,7 @@ from pathlib import Path
 from container import ConfigError, Container
 from log import Log
 
-GENERATE_VERSION = "0.0.15"
+GENERATE_VERSION = "0.0.13"
 HEADER = f"""#!/bin/sh
 # This script was generated by containerctl v{GENERATE_VERSION}
 # Report bugs with _this script_ to <tenno+containerctl@suij.in>
@@ -76,12 +76,11 @@ def main() -> None:
     if len(sys.argv) > log_threshold:
         base = sys.argv[3]
     logger = Log(log_file)
-    conf = Path(config_file)
-    data = load_container_config(conf, logger)
+    data = load_container_config(Path(config_file), logger)
     if data is None:
-        logger.log_error(f"{conf.name} is invalid, aborting!")
+        logger.log_error(f"{config_file} is invalid, aborting!")
         sys.exit(1)
-    logger.set_prefix(conf.name)
+    logger.set_prefix(Path(config_file).name)
     ct = create_container_from_config(data, logger)
     if ct is None:
         sys.exit(1)