Add podman support

Author: markcda

deploy-config.yaml

@@ -924,6 +924,7 @@ pipelines:
       - DEPL
     use_containerd_local_storage_cache: true
     prevent_metadata_loading: true
+    executor: podman
   exclusive_exec_tag: ru-containered
 artifacts:
 - target/release/deployer

src/containered.rs

@@ -208,6 +208,18 @@ pub struct ImagesReplacement {
 
 pub static PREVENT_METADATA_LOCK: &str = ".deployer-prevent-metadata.lock.json";
 
+pub fn choose_executor(opts: &ContaineredOpts, sudo: bool) -> String {
+  if opts.executor.as_ref().unwrap() == "podman" {
+    "sudo podman".to_string()
+  } else {
+    format!("{}docker", if sudo { "" } else { "sudo " })
+  }
+}
+
+pub fn is_docker(opts: &ContaineredOpts) -> bool {
+  opts.executor.is_none() || opts.executor.as_ref().unwrap() == "docker"
+}
+
 pub fn check_and_pull_once(
   env: &RunEnvironment,
   opts: &mut ContaineredOpts,
@@ -217,20 +229,16 @@ pub fn check_and_pull_once(
   let mut repls = crate::rw::read::<ImagesReplacement>(env.run_dir, PREVENT_METADATA_LOCK);
   if repls.base_from.ne(opts.base_image.as_deref().unwrap_or(BASE_IMAGE)) {
     if !repls.base_to.is_empty()
-      && run_simple(
-        env,
-        format!("{}docker rmi {}", if sudo { "" } else { "sudo " }, repls.base_to),
-      )
-      .is_err()
+      && run_simple(env, format!("{} rmi {}", choose_executor(opts, sudo), repls.base_to)).is_err()
     {
       println!("{}", i18n::CTRD_CANT_REMOVE_OLD_IMG.red());
       exit(1);
     }
     if run_simple(
       env,
       format!(
-        "{}docker pull {}",
-        if sudo { "" } else { "sudo " },
+        "{} pull {}",
+        choose_executor(opts, sudo),
         opts.base_image.as_deref().unwrap_or(BASE_IMAGE)
       ),
     )
@@ -242,8 +250,8 @@ pub fn check_and_pull_once(
     if run_simple(
       env,
       format!(
-        "{}docker tag {} {}_executor:latest",
-        if sudo { "" } else { "sudo " },
+        "{} tag {} {}_executor:latest",
+        choose_executor(opts, sudo),
         opts.base_image.as_deref().unwrap_or(BASE_IMAGE),
         exclusive_exec_tag
       ),
@@ -261,20 +269,16 @@ pub fn check_and_pull_once(
     .ne(opts.build_deployer_base_image.as_deref().unwrap_or(BASE_IMAGE))
   {
     if !repls.depl_to.is_empty()
-      && run_simple(
-        env,
-        format!("{}docker rmi {}", if sudo { "" } else { "sudo " }, repls.depl_to),
-      )
-      .is_err()
+      && run_simple(env, format!("{} rmi {}", choose_executor(opts, sudo), repls.depl_to)).is_err()
     {
       println!("{}", i18n::CTRD_CANT_REMOVE_OLD_IMG.red());
       exit(1);
     }
     if run_simple(
       env,
       format!(
-        "{}docker pull {}",
-        if sudo { "" } else { "sudo " },
+        "{} pull {}",
+        choose_executor(opts, sudo),
         opts.build_deployer_base_image.as_deref().unwrap_or(BASE_IMAGE)
       ),
     )
@@ -286,8 +290,8 @@ pub fn check_and_pull_once(
     if run_simple(
       env,
       format!(
-        "{}docker tag {} {}_builder:latest",
-        if sudo { "" } else { "sudo " },
+        "{} tag {} {}_builder:latest",
+        choose_executor(opts, sudo),
         opts.build_deployer_base_image.as_deref().unwrap_or(BASE_IMAGE),
         exclusive_exec_tag
       ),
@@ -341,13 +345,13 @@ pub fn execute_pipeline_containered(
   );
 
   let build_cmd = format!(
-    "{}docker build {}-t {}/{} -f Dockerfile.{}{} .",
-    if sudo { "" } else { "sudo " },
+    "{} build {}-t {}/{} -f Dockerfile.{}{} .",
+    choose_executor(&opts, sudo),
     if env.new_build { "--no-cache " } else { "" },
     config.project_name,
     pipeline.title,
     exclusive_exec_tag,
-    if opts.use_containerd_local_storage_cache.is_some_and(|v| v) {
+    if opts.use_containerd_local_storage_cache.is_some_and(|v| v) && is_docker(&opts) {
       format!(
         " --cache-to type=local,dest=.docker-cache/{},compression=zstd --cache-from type=local,src=.docker-cache/{}",
         exclusive_exec_tag, exclusive_exec_tag
@@ -364,11 +368,18 @@ pub fn execute_pipeline_containered(
 
   let volume_path = env.artifacts_dir.join(&pipeline.title);
 
+  if !is_docker(&opts) {
+    std::fs::create_dir_all(
+      env
+        .artifacts_dir
+        .join(pipeline.exclusive_exec_tag.as_deref().unwrap_or("default")),
+    )?;
+  }
   if run_simple(
     env,
     format!(
-      "{}docker run -v {:?}:/app/artifacts {}/{}",
-      if sudo { "" } else { "sudo " },
+      "{} run -v {:?}:/app/artifacts {}/{}",
+      choose_executor(&opts, sudo),
       volume_path,
       config.project_name,
       pipeline.title

src/entities/containered_opts.rs

@@ -56,6 +56,10 @@ pub struct ContaineredOpts {
   /// Prevent metadata loading on every startup.
   #[serde(skip_serializing_if = "Option::is_none")]
   pub prevent_metadata_loading: Option<bool>,
+
+  /// Executor (Docker or Podman - Docker by default).
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub executor: Option<String>,
 }
 
 impl ContaineredOpts {