aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2018-07-05 14:43:53 -0400
committerJeff Johnston2018-07-10 13:11:19 -0400
commit68cbf63c58f7f102eee45260d1e182b5fe441a3b (patch)
tree0cca5b2d3dbab8ce8bc7d4d84211346376c60980
parent2b21e522570a7f20c2c7d620878466ab2bbf7f28 (diff)
downloadorg.eclipse.linuxtools-68cbf63c58f7f102eee45260d1e182b5fe441a3b.tar.gz
org.eclipse.linuxtools-68cbf63c58f7f102eee45260d1e182b5fe441a3b.tar.xz
org.eclipse.linuxtools-68cbf63c58f7f102eee45260d1e182b5fe441a3b.zip
Bug 536441 - ContainerLauncher does not use build environment variables
- fix ContainerLauncher to add env list created to DockerContainerConfig via its Builder Change-Id: I85d4a05b01c550bf395e390f7e2beaeab295cc45 Reviewed-on: https://git.eclipse.org/r/125657 Tested-by: CI Bot Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> Reviewed-on: https://git.eclipse.org/r/125664
-rw-r--r--containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/launch/ContainerLauncher.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/launch/ContainerLauncher.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/launch/ContainerLauncher.java
index 4f15f5d51e..9d64ec35e0 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/launch/ContainerLauncher.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/launch/ContainerLauncher.java
@@ -853,6 +853,7 @@ public class ContainerLauncher {
// via the HostConfig binds setting
DockerContainerConfig.Builder builder = new DockerContainerConfig.Builder()
+ .env(env)
.openStdin(stdinSupport)
.cmd(cmdList)
.image(image)