Add Artifact Registry to the Daemon struct

Author: rutvijmehta-harness

cmd/drone-acr/main.go

@@ -90,7 +90,7 @@ func main() {
 	if publicUrl != "" {
 		// Set this env variable if public URL for artifact is available
 		// If not, we will fall back to registry url
-		os.Setenv("DAEMON_REGISTRY", publicUrl)
+		os.Setenv("ARTIFACT_REGISTRY", publicUrl)
 	}
 
 	// invoke the base docker plugin binary

cmd/drone-docker/main.go

@@ -113,10 +113,10 @@ func main() {
 			EnvVar: "PLUGIN_DAEMON_OFF",
 		},
 		cli.StringFlag{
-			Name:   "daemon.registry",
-			Usage:  "daemon registry",
+			Name:   "artifact.registry",
+			Usage:  "artifact registry",
 			Value:  "https://index.docker.io/v1/",
-			EnvVar: "DAEMON_REGISTRY,PLUGIN_REGISTRY,DOCKER_REGISTRY",
+			EnvVar: "ARTIFACT_REGISTRY,PLUGIN_REGISTRY,DOCKER_REGISTRY",
 		},
 		cli.StringFlag{
 			Name:   "dockerfile",
@@ -352,20 +352,21 @@ func run(c *cli.Context) error {
 			SSHAgentKey: c.String("ssh-agent-key"),
 		},
 		Daemon: docker.Daemon{
-			Registry:      c.String("daemon.registry"),
-			Mirror:        c.String("daemon.mirror"),
-			StorageDriver: c.String("daemon.storage-driver"),
-			StoragePath:   c.String("daemon.storage-path"),
-			Insecure:      c.Bool("daemon.insecure"),
-			Disabled:      c.Bool("daemon.off"),
-			IPv6:          c.Bool("daemon.ipv6"),
-			Debug:         c.Bool("daemon.debug"),
-			Bip:           c.String("daemon.bip"),
-			DNS:           c.StringSlice("daemon.dns"),
-			DNSSearch:     c.StringSlice("daemon.dns-search"),
-			MTU:           c.String("daemon.mtu"),
-			Experimental:  c.Bool("daemon.experimental"),
-			RegistryType:  registryType,
+			Registry:         c.String("docker.registry"),
+			Mirror:           c.String("daemon.mirror"),
+			StorageDriver:    c.String("daemon.storage-driver"),
+			StoragePath:      c.String("daemon.storage-path"),
+			Insecure:         c.Bool("daemon.insecure"),
+			Disabled:         c.Bool("daemon.off"),
+			IPv6:             c.Bool("daemon.ipv6"),
+			Debug:            c.Bool("daemon.debug"),
+			Bip:              c.String("daemon.bip"),
+			DNS:              c.StringSlice("daemon.dns"),
+			DNSSearch:        c.StringSlice("daemon.dns-search"),
+			MTU:              c.String("daemon.mtu"),
+			Experimental:     c.Bool("daemon.experimental"),
+			RegistryType:     registryType,
+			ArtifactRegistry: c.String("artifact.registry"),
 		},
 	}
 

docker.go

@@ -16,20 +16,21 @@ import (
 type (
 	// Daemon defines Docker daemon parameters.
 	Daemon struct {
-		Registry      string             // Docker registry
-		Mirror        string             // Docker registry mirror
-		Insecure      bool               // Docker daemon enable insecure registries
-		StorageDriver string             // Docker daemon storage driver
-		StoragePath   string             // Docker daemon storage path
-		Disabled      bool               // DOcker daemon is disabled (already running)
-		Debug         bool               // Docker daemon started in debug mode
-		Bip           string             // Docker daemon network bridge IP address
-		DNS           []string           // Docker daemon dns server
-		DNSSearch     []string           // Docker daemon dns search domain
-		MTU           string             // Docker daemon mtu setting
-		IPv6          bool               // Docker daemon IPv6 networking
-		Experimental  bool               // Docker daemon enable experimental mode
-		RegistryType  drone.RegistryType // Docker registry type
+		Registry         string             // Docker registry
+		Mirror           string             // Docker registry mirror
+		Insecure         bool               // Docker daemon enable insecure registries
+		StorageDriver    string             // Docker daemon storage driver
+		StoragePath      string             // Docker daemon storage path
+		Disabled         bool               // DOcker daemon is disabled (already running)
+		Debug            bool               // Docker daemon started in debug mode
+		Bip              string             // Docker daemon network bridge IP address
+		DNS              []string           // Docker daemon dns server
+		DNSSearch        []string           // Docker daemon dns search domain
+		MTU              string             // Docker daemon mtu setting
+		IPv6             bool               // Docker daemon IPv6 networking
+		Experimental     bool               // Docker daemon enable experimental mode
+		RegistryType     drone.RegistryType // Docker registry type
+		ArtifactRegistry string             // Docker registry where artifact can be viewed
 	}
 
 	// Login defines Docker login parameters.
@@ -231,7 +232,8 @@ func (p Plugin) Exec() error {
 
 	if p.ArtifactFile != "" {
 		if digest, err := getDigest(p.Build.TempTag); err == nil {
-			if err = drone.WritePluginArtifactFile(p.Daemon.RegistryType, p.ArtifactFile, p.Daemon.Registry, p.Build.Repo, digest, p.Build.Tags); err != nil {
+			fmt.Printf("Got artifact reg %s and digest %s\n", p.Daemon.ArtifactRegistry, digest)
+			if err = drone.WritePluginArtifactFile(p.Daemon.RegistryType, p.ArtifactFile, p.Daemon.ArtifactRegistry, p.Build.Repo, digest, p.Build.Tags); err != nil {
 				fmt.Printf("failed to write plugin artifact file at path: %s with error: %s\n", p.ArtifactFile, err)
 			}
 		} else {