few tiny improvements to check test running

.github/workflows/test.yaml

@@ -13,7 +13,7 @@ jobs:
           - 6379:6379
     strategy:
       matrix:
-        image: [ "debian:bullseye", "ubuntu:focal" ]
+        image: [ "debian:bookworm", "ubuntu:focal" ]
     env:
       DOCKER_IMAGE: ${{ matrix.image }}
       CONTEXT: syntax-test
@@ -30,7 +30,7 @@ jobs:
       - salt-render-test
     strategy:
       matrix:
-        image: [ "debian:bullseye", "ubuntu:focal" ]
+        image: [ "debian:bookworm", "ubuntu:focal" ]
         context: [ "base", "server" ]
     env:
       DOCKER_IMAGE: ${{ matrix.image }}

deployment/docker/debian-bullseye/Dockerfile → deployment/docker/debian-bookworm/Dockerfile

@@ -1,4 +1,4 @@
-ARG tag="bullseye-slim"
+ARG tag="bookworm-slim"
 FROM debian:$tag AS salt-base
 # "" == latest
 ARG salt_ver=""

installer/install.py

@@ -151,7 +151,10 @@ def files_to_transfer() -> List[Tuple[str, str]]:
     # todo handle extensions/file_ext todo some files (configs) are provided as default args some are not
     state_tree_mapping = list(dir_mappings(MAIN_FILES_TO_TRANSFER, SALT_TREE_ROOT))  # dir
     salt_conf_mapping = list(file_mappings(configs, SALT_MINION_CONFIG))  # file *.conf
-    salt_keys_mapping = list(dir_content_mappings([secrets], SALT_KEY_LOCATION))
+    if secrets:
+        salt_keys_mapping = list(dir_content_mappings([secrets], SALT_KEY_LOCATION))
+    else:
+        salt_keys_mapping = []
 
     all_files = state_tree_mapping + salt_conf_mapping + salt_keys_mapping + extra
     log.debug(f"Files to transfer: {all_files}")

installer/utils/commands.py

@@ -5,11 +5,13 @@
 
 
 def requisite_commands(required_pkgs: List[str], required_pip: List[str]) -> List[str]:
-    # latest pip typically is required, cannot upgrade it in one run as some dependencies may require latest pip
-    return [
-        f"apt update -y && apt install -y {' '.join(required_pkgs)}",
-        f"salt-pip install {' '.join(required_pip)}"
-    ]
+    cmds = [f"apt update -y && apt install -y {' '.join(required_pkgs)}"]
+    if required_pip:
+        # latest pip typically is required, cannot upgrade it in one run as some dependencies may require latest pip
+        cmds.extend([
+            f"salt-pip install {' '.join(required_pip)}"
+        ])
+    return cmds
 
 def salt_download_and_install_commands(
         start_daemon: bool = True,