Merge pull request #89 from grafana/julienduchesne/expose-ports

Add configuration to expose ports
drone · Jan 7, 2022 · 84913ae · 84913ae
2 parents 216e4dd + 096546e
commit 84913ae
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/config/config.go b/config/config.go
@@ -59,6 +59,7 @@ type (
 			EnvironFile string `envconfig:"DRONE_AGENT_ENV_FILE"`
 			Environ     []string
 			Volumes     []string
+			Ports       []string          `envconfig:"DRONE_AGENT_PUBLISHED_PORTS"`
 			Labels      map[string]string `envconfig:"DRONE_AGENT_LABELS"`
 			NamePrefix  string            `envconfig:"DRONE_AGENT_NAME_PREFIX" default:"agent-"`
 		}

diff --git a/engine/engine.go b/engine/engine.go
@@ -66,6 +66,7 @@ func New(
 			secret:             config.Agent.Token,
 			envs:               config.Agent.Environ,
 			volumes:            config.Agent.Volumes,
+			ports:              config.Agent.Ports,
 			labels:             config.Agent.Labels,
 			proto:              config.Server.Proto,
 			host:               config.Server.Host,

diff --git a/engine/install.go b/engine/install.go
@@ -23,6 +23,7 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/mount"
 	docker "github.com/docker/docker/client"
+	"github.com/docker/go-connections/nat"
 )
 
 type installer struct {
@@ -33,6 +34,7 @@ type installer struct {
 	image            string
 	secret           string
 	volumes          []string
+	ports            []string
 	host             string
 	proto            string
 	envs             []string
@@ -216,13 +218,21 @@ poller:
 		mounts = nil
 	}
 
+	exposedPorts, portBindings, err := nat.ParsePortSpecs(i.ports)
+	if err != nil {
+		i.metrics.IncrServerInitError()
+		logger.WithError(err).Errorln("could not create port binding")
+		return i.errorUpdate(ctx, instance, err)
+	}
+
 	res, err := client.ContainerCreate(ctx,
 		&container.Config{
 			Image:        i.image,
 			AttachStdout: true,
 			AttachStderr: true,
 			Env:          envs,
 			Volumes:      toVol(volumes),
+			ExposedPorts: exposedPorts,
 			Labels: map[string]string{
 				"com.centurylinklabs.watchtower.enable":      "true",
 				"com.centurylinklabs.watchtower.stop-signal": "SIGHUP",
@@ -234,8 +244,9 @@ poller:
 			},
 		},
 		&container.HostConfig{
-			Binds:  volumes,
-			Mounts: mounts,
+			Binds:        volumes,
+			Mounts:       mounts,
+			PortBindings: portBindings,
 			RestartPolicy: container.RestartPolicy{
 				Name: "always",
 			},