Skip to content

Commit bc2ba51

Browse files
Use artifact registry instead of daemon registry (#8)
1 parent a4d8970 commit bc2ba51

File tree

2 files changed

+37
-27
lines changed

2 files changed

+37
-27
lines changed

app.go

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@ func Run() {
102102
Usage: "don't start the docker daemon",
103103
EnvVar: "PLUGIN_DAEMON_OFF",
104104
},
105+
cli.StringFlag{
106+
Name: "artifact.registry",
107+
Usage: "artifact registry",
108+
Value: "https://index.docker.io/v1/",
109+
EnvVar: "ARTIFACT_REGISTRY,PLUGIN_REGISTRY,DOCKER_REGISTRY",
110+
},
105111
cli.StringFlag{
106112
Name: "dockerfile",
107113
Usage: "build dockerfile",
@@ -372,19 +378,20 @@ func run(c *cli.Context) error {
372378
BuildxLoad: c.Bool("buildx-load"),
373379
},
374380
Daemon: Daemon{
375-
Registry: c.String("docker.registry"),
376-
Mirror: c.String("daemon.mirror"),
377-
StorageDriver: c.String("daemon.storage-driver"),
378-
StoragePath: c.String("daemon.storage-path"),
379-
Insecure: c.Bool("daemon.insecure"),
380-
Disabled: c.Bool("daemon.off"),
381-
IPv6: c.Bool("daemon.ipv6"),
382-
Debug: c.Bool("daemon.debug"),
383-
Bip: c.String("daemon.bip"),
384-
DNS: c.StringSlice("daemon.dns"),
385-
DNSSearch: c.StringSlice("daemon.dns-search"),
386-
MTU: c.String("daemon.mtu"),
387-
RegistryType: registryType,
381+
Registry: c.String("docker.registry"),
382+
Mirror: c.String("daemon.mirror"),
383+
StorageDriver: c.String("daemon.storage-driver"),
384+
StoragePath: c.String("daemon.storage-path"),
385+
Insecure: c.Bool("daemon.insecure"),
386+
Disabled: c.Bool("daemon.off"),
387+
IPv6: c.Bool("daemon.ipv6"),
388+
Debug: c.Bool("daemon.debug"),
389+
Bip: c.String("daemon.bip"),
390+
DNS: c.StringSlice("daemon.dns"),
391+
DNSSearch: c.StringSlice("daemon.dns-search"),
392+
MTU: c.String("daemon.mtu"),
393+
RegistryType: registryType,
394+
ArtifactRegistry: c.String("artifact.registry"),
388395
},
389396
Builder: Builder{
390397
Name: c.String("builder-name"),

docker.go

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@ import (
1515
type (
1616
// Daemon defines Docker daemon parameters.
1717
Daemon struct {
18-
Registry string // Docker registry
19-
Mirror string // Docker registry mirror
20-
Insecure bool // Docker daemon enable insecure registries
21-
StorageDriver string // Docker daemon storage driver
22-
StoragePath string // Docker daemon storage path
23-
Disabled bool // DOcker daemon is disabled (already running)
24-
Debug bool // Docker daemon started in debug mode
25-
Bip string // Docker daemon network bridge IP address
26-
DNS []string // Docker daemon dns server
27-
DNSSearch []string // Docker daemon dns search domain
28-
MTU string // Docker daemon mtu setting
29-
IPv6 bool // Docker daemon IPv6 networking
30-
RegistryType drone.RegistryType // Docker registry type
18+
Registry string // Docker registry
19+
Mirror string // Docker registry mirror
20+
Insecure bool // Docker daemon enable insecure registries
21+
StorageDriver string // Docker daemon storage driver
22+
StoragePath string // Docker daemon storage path
23+
Disabled bool // DOcker daemon is disabled (already running)
24+
Debug bool // Docker daemon started in debug mode
25+
Bip string // Docker daemon network bridge IP address
26+
DNS []string // Docker daemon dns server
27+
DNSSearch []string // Docker daemon dns search domain
28+
MTU string // Docker daemon mtu setting
29+
IPv6 bool // Docker daemon IPv6 networking
30+
RegistryType drone.RegistryType // Docker registry type
31+
ArtifactRegistry string // Docker registry where artifact can be viewed
3132
}
3233

3334
Builder struct {
@@ -237,8 +238,10 @@ func (p Plugin) Exec() error {
237238

238239
// write to artifact file
239240
if p.ArtifactFile != "" {
241+
// ArtifactRegistry here will be read from env variable ARTIFACT_REGISTRY (valid for ACR). If this env
242+
// variable is not present, it'll be read from PLUGIN_REGISTRY which is valid for docker / ecr / gcr.
240243
if digest, err := getDigest(p.MetadataFile); err == nil {
241-
if err = drone.WritePluginArtifactFile(p.Daemon.RegistryType, p.ArtifactFile, p.Daemon.Registry, p.Build.Repo, digest, p.Build.Tags); err != nil {
244+
if err = drone.WritePluginArtifactFile(p.Daemon.RegistryType, p.ArtifactFile, p.Daemon.ArtifactRegistry, p.Build.Repo, digest, p.Build.Tags); err != nil {
242245
fmt.Printf("Failed to write plugin artifact file at path: %s with error: %s\n", p.ArtifactFile, err)
243246
}
244247
} else {

0 commit comments

Comments
 (0)