improve container load/install

scripts/calaos_install

@@ -267,9 +267,30 @@ arch-chroot ${dst} update-initramfs -u
 
 info "--> Exporting container images"
 for file in /usr/share/calaos/*.source; do
-  container_name=$(basename "$file" .source)
-  source "$file"
-  podman_export "$container_name" "$IMAGE_SRC" "${dst}"
+    container_name=$(basename "$file" .source)
+    source "$file"
+
+    if podman images | grep "$IMAGE_SRC"
+    then
+        podman_export "$container_name" "$IMAGE_SRC" "${dst}"
+    else
+        if [ -e "/var/lib/cache/containers/${container_name}.tar" ]
+        then
+            info "Image $IMAGE_SRC not found in local repository, copying it from cache"
+            rsync -avh /var/lib/cache/containers/${container_name}.tar ${dst}/var/lib/cache/containers/
+        else
+            info "Image $IMAGE_SRC not found in local repository, trying to pull it..."
+
+            podman pull "$IMAGE_SRC"
+
+            if podman images | grep "$IMAGE_SRC"
+            then
+                podman_export "$container_name" "$IMAGE_SRC" "${dst}"
+            else
+                err "Image $IMAGE_SRC not found, skipping"
+            fi
+        fi
+    fi
 done
 
 #Initialize Snapper. Unmount our predefined .snapshot folder, let snapper recreate it (it fails otherwise)

scripts/load_containers_cache

@@ -26,9 +26,15 @@ then
 
     # Podman loads file archive from cache and copy it in the local repository
     podman load < "$cache"
-
-    echo "Image : $image"
-
-    # Remove the cache
-    rm -rf "$cache"
+
+    #check if image is in local repository
+    if podman images | grep "$image"
+    then
+        echo "Image $image loaded"
+        # Remove the cache
+        rm -rf "$cache"
+    else
+        echo "Error: image $image not loaded, an error occured."
+        exit 1
+    fi
 fi