From dfae9fbefbdcb12e74e38910befdea1a22ce8e37 Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Fri, 17 Mar 2023 15:48:19 +0100
Subject: [PATCH] osbuild/skopeo: reverse the constructor args

Put the path (which becomes an option) first and the inputs second.
This is more in line with other stage constructors.
---
 internal/manifest/os.go          | 2 +-
 internal/osbuild/skopeo_stage.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/manifest/os.go b/internal/manifest/os.go
index d6e96df05..f81297b50 100644
--- a/internal/manifest/os.go
+++ b/internal/manifest/os.go
@@ -352,7 +352,7 @@ func (p *OS) serialize() osbuild.Pipeline {
 			pipeline.AddStage(osbuild.NewContainersStorageConfStage(containerStoreOpts))
 		}
 
-		skopeo := osbuild.NewSkopeoStage(images, storagePath)
+		skopeo := osbuild.NewSkopeoStage(storagePath, images)
 		pipeline.AddStage(skopeo)
 	}
 
diff --git a/internal/osbuild/skopeo_stage.go b/internal/osbuild/skopeo_stage.go
index 83260e501..c0ac14fbd 100644
--- a/internal/osbuild/skopeo_stage.go
+++ b/internal/osbuild/skopeo_stage.go
@@ -12,7 +12,7 @@ type SkopeoStageOptions struct {
 
 func (o SkopeoStageOptions) isStageOptions() {}
 
-func NewSkopeoStage(images ContainersInput, path string) *Stage {
+func NewSkopeoStage(path string, images ContainersInput) *Stage {
 
 	inputs := ContainersInputs{
 		"images": images,