From 592b45d93a4da8b05911fd82c3265ba083f03fd0 Mon Sep 17 00:00:00 2001 From: Chris Bednarski Date: Wed, 23 Sep 2015 15:28:58 -0700 Subject: [PATCH] Docs and remove uppercase since it's checked at the config parse step --- client/driver/driver.go | 7 ++++--- website/source/docs/jobspec/environment.html.md | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/driver/driver.go b/client/driver/driver.go index 78d33cad4..6b0bc91a9 100644 --- a/client/driver/driver.go +++ b/client/driver/driver.go @@ -116,14 +116,15 @@ func PopulateEnvironment(ctx *ExecContext, task *structs.Task) []string { env = append(env, fmt.Sprintf("NOMAD_MEMORY_LIMIT=%d", task.Resources.MemoryMB)) env = append(env, fmt.Sprintf("NOMAD_CPU_LIMIT=%d", task.Resources.CPU)) - // Named Ports if len(task.Resources.Networks) > 0 { network := task.Resources.Networks[0] - env = append(env, fmt.Sprintf("NOMAD_HOST_IP=%s", network.IP)) + // IP address for this task + env = append(env, fmt.Sprintf("NOMAD_IP=%s", network.IP)) + // Named ports for this task for label, port := range network.MapDynamicPorts() { - env = append(env, fmt.Sprintf("NOMAD_PORT_%s=%d", strings.ToUpper(label), port)) + env = append(env, fmt.Sprintf("NOMAD_PORT_%s=%d", label, port)) } } } diff --git a/website/source/docs/jobspec/environment.html.md b/website/source/docs/jobspec/environment.html.md index 25dce12a5..3aacd2c05 100644 --- a/website/source/docs/jobspec/environment.html.md +++ b/website/source/docs/jobspec/environment.html.md @@ -54,7 +54,7 @@ the private port number. For example, `dynamic_ports = ["5000"]` will have a random port mapped to port 5000 inside the container or VM. These ports are also exported as environment variables for consistency, e.g. `NOMAD_PORT_5000`. -Please see the relevant driver documentation for exact details. +Please see the relevant driver documentation for details. ## Meta