Custom port number support (GoogleCloudPlatform#192)

Fixes GoogleCloudPlatform#185.

Signed-off-by: Ahmet Alp Balkan <[email protected]>

Author: ahmetb

README.md

@@ -47,7 +47,7 @@ If you include an `app.json` at the root of your repository, it allows you
 customize the experience such as defining an alternative service name, or
 prompting for additional environment variables.
 
-For example:
+For example, a fully populated `app.json` file looks like this:
 
 ```json
 {
@@ -68,7 +68,8 @@ For example:
     "options": {
         "allow-unauthenticated": false,
         "memory": "512Mi",
-        "cpu": "1"
+        "cpu": "1",
+        "port": "80"
     },
     "build": {
         "skip": false,
@@ -117,6 +118,8 @@ Reference:
   - `allow-unauthenticated`: _(optional, default: `true`)_ allow unauthenticated requests
   - `memory`: _(optional)_ memory for each instance
   - `cpu`: _(optional)_ cpu for each instance
+  - `port`: _(optional)_ if your application doesn't respect the PORT environment
+    variable provided by Cloud Run, specify the port number it listens on.
 - `build`: _(optional)_ Build configuration
   - `skip`: _(optional, default: `false`)_ skips the built-in build methods (`docker build`, `Maven Jib`, and
  `buildpacks`), but still allows for `prebuild` and `postbuild` hooks to be run in order to build the container image

cmd/cloudshell_open/appfile.go

@@ -39,18 +39,19 @@ type options struct {
 	AllowUnauthenticated *bool  `json:"allow-unauthenticated"`
 	Memory               string `json:"memory"`
 	CPU                  string `json:"cpu"`
+	Port                 int    `json:"port"`
 }
 
 type hook struct {
 	Commands []string `json:"commands"`
 }
 
 type buildpacks struct {
-	Builder	string `json:"builder"`
+	Builder string `json:"builder"`
 }
 
 type build struct {
-	Skip *bool `json:"skip"`
+	Skip       *bool      `json:"skip"`
 	Buildpacks buildpacks `json:"buildpacks"`
 }
 

cmd/cloudshell_open/deploy.go

@@ -106,8 +106,8 @@ func newService(name, project, image string, envs map[string]string, options opt
 				Spec: &runapi.RevisionSpec{
 					Containers: []*runapi.Container{
 						{
-							Image: image,
-							Env:   envVars,
+							Image:     image,
+							Env:       envVars,
 							Resources: optionsToResourceRequirements(options),
 						},
 					},
@@ -117,6 +117,10 @@ func newService(name, project, image string, envs map[string]string, options opt
 			},
 		},
 	}
+	if options.Port > 0 {
+		svc.Spec.Template.Spec.Containers[0].Ports = append(svc.Spec.Template.Spec.Containers[0].Ports,
+			&runapi.ContainerPort{ContainerPort: int64(options.Port)})
+	}
 	applyMeta(svc.Metadata, image)
 	applyMeta(svc.Spec.Template.Metadata, image)
 

cmd/cloudshell_open/main.go

@@ -369,7 +369,10 @@ func run(opts runOpts) error {
 	cmdColor.Printf("\t  --region=%s", parameter(region))
 	cmdColor.Println("\\")
 	cmdColor.Printf("\t  --image=%s", parameter(image))
-
+	if appFile.Options.Port > 0 {
+		cmdColor.Println("\\")
+		cmdColor.Printf("\t  --port=%s", parameter(fmt.Sprintf("%d", appFile.Options.Port)))
+	}
 	if len(envs) > 0 {
 		cmdColor.Println("\\")
 		cmdColor.Printf("\t  --update-env-vars=%s", parameter(strings.Join(envs, ",")))