add auth flag

Signed-off-by: Horiodino <[email protected]>

cmd/oci/oci.go

@@ -21,7 +21,7 @@ import (
 )
 
 var (
-	platform, output, tag, path                           string
+	platform, output, tag, path, auth                     string
 	push, loadDocker, loadPodman, devDeps, dfSwap, digest bool
 )
 var (
@@ -39,6 +39,7 @@ func init() {
 	OCICmd.Flags().StringVarP(&tag, "tag", "t", "", "The tag that will be replaced with original tag in Dockerfile")
 	OCICmd.Flags().StringVar(&path, "path", "", "The path to Dockerfile")
 	OCICmd.Flags().BoolVar(&digest, "digest", false, "Get the digest of the image")
+	OCICmd.Flags().StringVar(&auth, "auth", "", "The auth to use to authenticate to the registry")
 }
 
 // OCICmd represents the export command
@@ -213,20 +214,19 @@ var OCICmd = &cobra.Command{
 
 		if push {
 			fmt.Println(styles.HighlightStyle.Render("Pushing image to registry..."))
-			err = oci.Push(output+"/result", artifact.Name)
+			err = oci.Push(output+"/result", artifact.Name, digest, auth)
 			if err != nil {
 				fmt.Println(styles.ErrorStyle.Render("error:", err.Error()))
 				os.Exit(1)
 			}
 			fmt.Println(styles.SucessStyle.Render(fmt.Sprintf("Image %s pushed to registry", artifact.Name)))
-
 			if digest {
-				fmt.Println(styles.HighlightStyle.Render("Getting digest of the image..."))
-				err = oci.GetDigest(artifact.Name)
+				digest, err := os.ReadFile("bsf-result/digest")
 				if err != nil {
 					fmt.Println(styles.ErrorStyle.Render("error:", err.Error()))
 					os.Exit(1)
 				}
+				fmt.Println(styles.SucessStyle.Render(fmt.Sprintf("Digest: %s", string(digest))))
 			}
 		}
 	},

pkg/oci/skopeo.go

@@ -1,11 +1,8 @@
 package oci
 
 import (
-	"fmt"
 	"os"
 	"os/exec"
-
-	"github.com/google/go-containerregistry/pkg/crane"
 )
 
 // LoadDocker loads the image to the docker daemon
@@ -35,8 +32,14 @@ func LoadPodman(dir, imageName string) error {
 }
 
 // Push image to registry
-func Push(dir, imageName string) error {
-	cmd := exec.Command("nix", "run", "nixpkgs#skopeo", "--", "copy", "--insecure-policy", "dir:"+dir, "docker://"+imageName)
+func Push(dir, imageName string, digest bool, auth string) error {
+	var cmd *exec.Cmd
+	if digest {
+		cmd = exec.Command("skopeo", "copy", "--insecure-policy", "dir:"+dir, "docker://"+imageName+"@@unknown-digest@@", "--digestfile=bsf-result/digest", "--dest-creds", auth)
+
+	} else {
+		cmd = exec.Command("nix", "run", "nixpkgs#skopeo", "--", "copy", "--insecure-policy", "dir:"+dir, "docker://"+imageName, "--dest-creds", auth)
+	}
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err := cmd.Run()
@@ -46,13 +49,3 @@ func Push(dir, imageName string) error {
 
 	return nil
 }
-
-func GetDigest(image string) error {
-	digest, err := crane.Digest(image)
-	if err != nil {
-		return err
-	}
-
-	fmt.Println("Digest:", digest)
-	return nil
-}