stage0: add --expose flag on app level

common/apps/apps.go

@@ -54,6 +54,7 @@ type App struct {
 	WorkingDir        string                            // working directory override for image
 	ReadOnlyRootFS    bool                              // read-only rootfs override.
 	Mounts            []schema.Mount                    // mounts for this app (superseding any mounts in rktApps.mounts of same MountPoint)
+	Ports             []types.Port                      // ports for this app to be exposed
 	MemoryLimit       *types.ResourceMemory             // memory isolator override
 	CPULimit          *types.ResourceCPU                // cpu isolator override
 	CPUShares         *types.LinuxCPUShares             // cpu-shares isolator override

rkt/cli_apps.go

@@ -17,6 +17,7 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"net/url"
 	"strconv"
@@ -895,3 +896,35 @@ func (au *appStderr) String() string {
 func (au *appStderr) Type() string {
 	return "appStderr"
 }
+
+// appExpose is for --expose flags in the form of: --expose=query,protocol=tcp,port=8080,count=1,socketActivated=true
+type appExpose apps.Apps
+
+func (ae *appExpose) Set(s string) error {
+	port, err := types.PortFromString(s)
+	if err != nil {
+		return err
+	}
+	if port.Protocol == "" {
+		port.Protocol = "tcp"
+	}
+	app := (*apps.Apps)(ae).Last()
+	if app == nil {
+		return fmt.Errorf("--expose must follow an application")
+	}
+	app.Ports = append(app.Ports, *port)
+	return nil
+}
+
+func (ae *appExpose) String() string {
+	app := (*apps.Apps)(ae).Last()
+	if app == nil {
+		return ""
+	}
+	bs, _ := json.Marshal(app.Ports)
+	return string(bs)
+}
+
+func (ae *appExpose) Type() string {
+	return "appExpose"
+}

rkt/run.go

@@ -103,6 +103,7 @@ func addAppFlags(cmd *cobra.Command) {
 	cmd.Flags().Var((*appWorkingDir)(&rktApps), "working-dir", "override the working directory of the preceding image")
 	cmd.Flags().Var((*appReadOnlyRootFS)(&rktApps), "readonly-rootfs", "if set, the app's rootfs will be mounted read-only")
 	cmd.Flags().Var((*appMount)(&rktApps), "mount", "mount point binding a volume to a path within an app")
+	cmd.Flags().Var((*appExpose)(&rktApps), "expose", "expose ports of the application (example: '--expose=http,protocol=tcp,port=8080')")
 	cmd.Flags().Var((*appUser)(&rktApps), "user", "user override for the preceding image (example: '--user=user')")
 	cmd.Flags().Var((*appGroup)(&rktApps), "group", "group override for the preceding image (example: '--group=group')")
 	cmd.Flags().Var((*appSupplementaryGIDs)(&rktApps), "supplementary-gids", "supplementary group IDs override for the preceding image (examples: '--supplementary-gids=1024,2048'")
@@ -335,7 +336,6 @@ func runRun(cmd *cobra.Command, args []string) (exit int) {
 		pcfg.EnvFromFile = flagEnvFromFile.Strings()
 		pcfg.Apps = &rktApps
 	}
-
 	if globalFlags.Debug {
 		stage0.InitDebug()
 	}

stage0/common.go

@@ -111,7 +111,6 @@ func (ce CrossingEntrypoint) Run() error {
 // generateRuntimeApp merges runtime information from the image manifest and from
 // runtime configuration overrides, returning a full configuration for a runtime app
 func generateRuntimeApp(appRunConfig *apps.App, am *schema.ImageManifest, podMounts []schema.Mount) (schema.RuntimeApp, error) {
-
 	ra := schema.RuntimeApp{
 		App: am.App,
 		Image: schema.RuntimeImage{
@@ -122,6 +121,9 @@ func generateRuntimeApp(appRunConfig *apps.App, am *schema.ImageManifest, podMou
 		Mounts:         MergeMounts(podMounts, appRunConfig.Mounts),
 		ReadOnlyRootFS: appRunConfig.ReadOnlyRootFS,
 	}
+	if ra.App != nil && appRunConfig != nil {
+		ra.App.Ports = MergePorts(ra.App.Ports, appRunConfig.Ports)
+	}
 
 	appName, err := types.NewACName(appRunConfig.Name)
 	if err != nil {

stage0/run.go

@@ -188,6 +188,24 @@ func MergeMounts(mounts []schema.Mount, appMounts []schema.Mount) []schema.Mount
 	return deduplicateMPs(ml)
 }
 
+// MergePorts merges two port lists
+func MergePorts(a, b []types.Port) []types.Port {
+	m := make(map[types.ACName]types.Port)
+	for _, port := range a {
+		m[port.Name] = port
+	}
+	for _, port := range b {
+		m[port.Name] = port
+	}
+	res := make([]types.Port, len(m))
+	i := 0
+	for _, port := range m {
+		res[i] = port
+		i++
+	}
+	return res
+}
+
 // generatePodManifest creates the pod manifest from the command line input.
 // It returns the pod manifest as []byte on success.
 // This is invoked if no pod manifest is specified at the command line.