feat: support private docker registries (#45)

Author: w-h-a

cmd/engine.go

@@ -152,6 +152,8 @@ func initBroker() broker.Broker {
 func initRunner() runner.Runner {
 	return docker.NewRunner(
 		runner.WithHost(config.RunnerHost()),
+		runner.WithRegistryUser(config.RunnerRegistryUser()),
+		runner.WithRegistryPass(config.RunnerRegistryPass()),
 	)
 }
 

internal/engine/clients/runner/docker/runner.go

@@ -2,6 +2,8 @@ package docker
 
 import (
 	"context"
+	"encoding/base64"
+	"encoding/json"
 	"io"
 	"log/slog"
 	"maps"
@@ -14,6 +16,7 @@ import (
 	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/api/types/network"
+	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/api/types/volume"
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/stdcopy"
@@ -254,7 +257,15 @@ func (r *dockerRunner) pullImage(ctx context.Context, tag string) error {
 			}
 		}
 
-		reader, err := r.client.ImagePull(ctx, tag, image.PullOptions{})
+		authConfig := registry.AuthConfig{
+			Username: r.options.RegistryUser,
+			Password: r.options.RegistryPass,
+		}
+
+		encoded, _ := json.Marshal(authConfig)
+		registryAuth := base64.URLEncoding.EncodeToString(encoded)
+
+		reader, err := r.client.ImagePull(ctx, tag, image.PullOptions{RegistryAuth: registryAuth})
 		if err != nil {
 			return err
 		}

internal/engine/clients/runner/options.go

@@ -5,8 +5,10 @@ import "context"
 type Option func(o *Options)
 
 type Options struct {
-	Host    string
-	Context context.Context
+	Host         string
+	RegistryUser string
+	RegistryPass string
+	Context      context.Context
 }
 
 func WithHost(host string) Option {
@@ -15,6 +17,18 @@ func WithHost(host string) Option {
 	}
 }
 
+func WithRegistryUser(user string) Option {
+	return func(o *Options) {
+		o.RegistryUser = user
+	}
+}
+
+func WithRegistryPass(pass string) Option {
+	return func(o *Options) {
+		o.RegistryPass = pass
+	}
+}
+
 func NewOptions(opts ...Option) Options {
 	options := Options{
 		Context: context.Background(),

internal/engine/config/config.go

@@ -29,6 +29,8 @@ type config struct {
 	brokerLocation     string
 	runner             string
 	runnerHost         string
+	runnerRegistryUser string
+	runnerRegistryPass string
 	readwriter         string
 	readwriterLocation string
 }
@@ -47,6 +49,8 @@ func New() {
 			brokerLocation:     "",
 			runner:             "docker",
 			runnerHost:         "unix:///var/run/docker.sock",
+			runnerRegistryUser: "",
+			runnerRegistryPass: "",
 			readwriter:         "memory",
 			readwriterLocation: "",
 		}
@@ -82,7 +86,7 @@ func New() {
 		}
 
 		qs := os.Getenv("QUEUES")
-		if len(qs) > 0 {
+		if len(qs) > 0 && instance.mode == "worker" {
 			for _, q := range strings.Split(qs, ",") {
 				q = strings.TrimSpace(q)
 				if len(q) == 0 {
@@ -132,6 +136,16 @@ func New() {
 			instance.runnerHost = runnerHost
 		}
 
+		runnerRegistryUser := os.Getenv("RUNNER_REGISTRY_USER")
+		if len(runnerRegistryUser) > 0 {
+			instance.runnerRegistryUser = runnerRegistryUser
+		}
+
+		runnerRegistryPass := os.Getenv("RUNNER_REGISTRY_PASS")
+		if len(runnerRegistryPass) > 0 {
+			instance.runnerRegistryPass = runnerRegistryPass
+		}
+
 		rw := os.Getenv("READ_WRITER")
 		if len(rw) > 0 {
 			if _, ok := readwriter.ReadWriterTypes[rw]; ok {
@@ -240,6 +254,22 @@ func RunnerHost() string {
 	return instance.runnerHost
 }
 
+func RunnerRegistryUser() string {
+	if instance == nil {
+		panic("cfg is nil")
+	}
+
+	return instance.runnerRegistryUser
+}
+
+func RunnerRegistryPass() string {
+	if instance == nil {
+		panic("cfg is nil")
+	}
+
+	return instance.runnerRegistryPass
+}
+
 func ReadWriter() string {
 	if instance == nil {
 		panic("cfg is nil")

tests/testdata/hello.json

@@ -0,0 +1,9 @@
+{
+    "name": "simple example",
+    "image": "ubuntu:mantic",
+    "cmd": [
+        "echo",
+        "-n",
+        "hello world"
+    ]
+}