fix: append imageDir to docker load commands

actions/push-images/__tests__/docker.test.ts

@@ -29,69 +29,73 @@ describe('buildCommands', () => {
       'querytee-2.9.4-linux-amd64.tar'
     ])
 
-    expect(commands).toEqual([
+    const expected = [
       `cd /images`,
 
-      `docker load -i fluent-bit-2.9.4-linux-amd64.tar`,
+      `docker load -i /images/fluent-bit-2.9.4-linux-amd64.tar`,
       `docker push -a grafana/fluent-bit`,
       `docker manifest create grafana/fluent-bit:2.9.4 grafana/fluent-bit:2.9.4-amd64`,
       `docker manifest push grafana/fluent-bit:2.9.4`,
 
-      `docker load -i fluentd-2.9.4-linux-amd64.tar`,
+      `docker load -i /images/fluentd-2.9.4-linux-amd64.tar`,
       `docker push -a grafana/fluentd`,
       `docker manifest create grafana/fluentd:2.9.4 grafana/fluentd:2.9.4-amd64`,
       `docker manifest push grafana/fluentd:2.9.4`,
 
-      `docker load -i logcli-2.9.4-linux-amd64.tar`,
-      `docker load -i logcli-2.9.4-linux-arm.tar`,
-      `docker load -i logcli-2.9.4-linux-arm64.tar`,
+      `docker load -i /images/logcli-2.9.4-linux-amd64.tar`,
+      `docker load -i /images/logcli-2.9.4-linux-arm.tar`,
+      `docker load -i /images/logcli-2.9.4-linux-arm64.tar`,
       `docker push -a grafana/logcli`,
       `docker manifest create grafana/logcli:2.9.4 grafana/logcli:2.9.4-amd64 grafana/logcli:2.9.4-arm grafana/logcli:2.9.4-arm64`,
       `docker manifest push grafana/logcli:2.9.4`,
 
-      `docker load -i logstash-2.9.4-linux-amd64.tar`,
+      `docker load -i /images/logstash-2.9.4-linux-amd64.tar`,
       `docker push -a grafana/logstash`,
       `docker manifest create grafana/logstash:2.9.4 grafana/logstash:2.9.4-amd64`,
       `docker manifest push grafana/logstash:2.9.4`,
 
-      `docker load -i loki-2.9.4-linux-amd64.tar`,
-      `docker load -i loki-2.9.4-linux-arm.tar`,
-      `docker load -i loki-2.9.4-linux-arm64.tar`,
+      `docker load -i /images/loki-2.9.4-linux-amd64.tar`,
+      `docker load -i /images/loki-2.9.4-linux-arm.tar`,
+      `docker load -i /images/loki-2.9.4-linux-arm64.tar`,
       `docker push -a grafana/loki`,
       `docker manifest create grafana/loki:2.9.4 grafana/loki:2.9.4-amd64 grafana/loki:2.9.4-arm grafana/loki:2.9.4-arm64`,
       `docker manifest push grafana/loki:2.9.4`,
 
-      `docker load -i loki-canary-2.9.4-linux-amd64.tar`,
-      `docker load -i loki-canary-2.9.4-linux-arm.tar`,
-      `docker load -i loki-canary-2.9.4-linux-arm64.tar`,
+      `docker load -i /images/loki-canary-2.9.4-linux-amd64.tar`,
+      `docker load -i /images/loki-canary-2.9.4-linux-arm.tar`,
+      `docker load -i /images/loki-canary-2.9.4-linux-arm64.tar`,
       `docker push -a grafana/loki-canary`,
       `docker manifest create grafana/loki-canary:2.9.4 grafana/loki-canary:2.9.4-amd64 grafana/loki-canary:2.9.4-arm grafana/loki-canary:2.9.4-arm64`,
       `docker manifest push grafana/loki-canary:2.9.4`,
 
-      `docker load -i loki-canary-boringcrypto-2.9.4-linux-amd64.tar`,
-      `docker load -i loki-canary-boringcrypto-2.9.4-linux-arm.tar`,
-      `docker load -i loki-canary-boringcrypto-2.9.4-linux-arm64.tar`,
+      `docker load -i /images/loki-canary-boringcrypto-2.9.4-linux-amd64.tar`,
+      `docker load -i /images/loki-canary-boringcrypto-2.9.4-linux-arm.tar`,
+      `docker load -i /images/loki-canary-boringcrypto-2.9.4-linux-arm64.tar`,
       `docker push -a grafana/loki-canary-boringcrypto`,
       `docker manifest create grafana/loki-canary-boringcrypto:2.9.4 grafana/loki-canary-boringcrypto:2.9.4-amd64 grafana/loki-canary-boringcrypto:2.9.4-arm grafana/loki-canary-boringcrypto:2.9.4-arm64`,
       `docker manifest push grafana/loki-canary-boringcrypto:2.9.4`,
 
-      `docker load -i loki-operator-2.9.4-linux-amd64.tar`,
+      `docker load -i /images/loki-operator-2.9.4-linux-amd64.tar`,
       `docker push -a grafana/loki-operator`,
       `docker manifest create grafana/loki-operator:2.9.4 grafana/loki-operator:2.9.4-amd64`,
       `docker manifest push grafana/loki-operator:2.9.4`,
 
-      `docker load -i promtail-2.9.4-linux-amd64.tar`,
-      `docker load -i promtail-2.9.4-linux-arm.tar`,
-      `docker load -i promtail-2.9.4-linux-arm64.tar`,
+      `docker load -i /images/promtail-2.9.4-linux-amd64.tar`,
+      `docker load -i /images/promtail-2.9.4-linux-arm.tar`,
+      `docker load -i /images/promtail-2.9.4-linux-arm64.tar`,
       `docker push -a grafana/promtail`,
       `docker manifest create grafana/promtail:2.9.4 grafana/promtail:2.9.4-amd64 grafana/promtail:2.9.4-arm grafana/promtail:2.9.4-arm64`,
       `docker manifest push grafana/promtail:2.9.4`,
 
-      `docker load -i querytee-2.9.4-linux-amd64.tar`,
+      `docker load -i /images/querytee-2.9.4-linux-amd64.tar`,
       `docker push -a grafana/querytee`,
       `docker manifest create grafana/querytee:2.9.4 grafana/querytee:2.9.4-amd64`,
       `docker manifest push grafana/querytee:2.9.4`
-    ])
+    ]
+
+    for (const command of expected) {
+      expect(commands).toContain(command)
+    }
   })
 
   it('tags and pushes each architecture for each docker plugin', () => {

actions/push-images/src/docker.ts

@@ -99,7 +99,7 @@ export function buildCommands(
         version = v
       }
       const shortPlatform = platform.split('/')[1]
-      commands.push(`docker load -i ${file}`)
+      commands.push(`docker load -i ${imageDir}/${file}`)
       manifests.push(`${repo}/${image}:${version.toString()}-${shortPlatform}`)
     }