From 95dea97382b03657feb781cfa7966bf9cd717294 Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Fri, 1 Jul 2022 13:10:26 +0200
Subject: [PATCH] Fix skopeo copy syntax

---
 .../roles/metacluster/tasks/main.yml              | 15 +++++++--------
 ansible/roles/metacluster/tasks/components.yml    |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
index 1ed15dc..0814236 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml
@@ -102,22 +102,21 @@
           k3s ctr run \
             --rm \
             --mount type=bind,src=$PWD,dst=/data,options=rbind:ro \
-            quay.io/skopeo/stable:v1.8.0 \
-            skopeo-{{ lookup('community.general.random_string', length=5) }} \
-            skopeo list-tags /data/{{ item }} | \
+            quay.io/skopeo/stable:v1.8.0 skopeo \
+            skopeo list-tags docker-archive:/data/{{ item }} | \
           jq -r '.Tags[0]')
     chdir: /opt/metacluster/container-images/
   register: results
-  ignore_errors: yes
+#  ignore_errors: yes
   loop: "{{ imagetarballs.files }}"
 
 - ansible.builtin.debug:
     var: results
 
-#- name: Delete container image tarballs/archives
-#  ansible.builtin.file:
-#    path: /opt/metacluster/container-images
-#    state: absent
+- name: Delete container image tarballs/archives
+  ansible.builtin.file:
+    path: /opt/metacluster/container-images
+    state: absent
 
 - name: Cleanup tempfile
   ansible.builtin.file:
diff --git a/ansible/roles/metacluster/tasks/components.yml b/ansible/roles/metacluster/tasks/components.yml
index 72861ef..3fbd3ac 100644
--- a/ansible/roles/metacluster/tasks/components.yml
+++ b/ansible/roles/metacluster/tasks/components.yml
@@ -36,7 +36,7 @@
   ansible.builtin.command:
     cmd: skopeo copy docker://{{ item }} docker-archive:./{{ ( item | regex_findall('[^/:]+'))[-2] }}.tar:{{ item }}
     chdir: /opt/metacluster/container-images
-  loop: "{{ containerimages.results | map(attribute='stdout_lines') | flatten + dependencies.container_images}}"
+  loop: "{{ containerimages.results | map(attribute='stdout_lines') | flatten + dependencies.container_images }}"
 
 - name: Compress tarballs
   community.general.archive: