integration-cli: Preserve DOCKER_TEST_HOST in env-clearing tests #10800
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -863,6 +863,10 @@ func TestRunEnvironmentErase(t *testing.T) { | |||
| // the container | |||
| cmd := exec.Command(dockerBinary, "run", "-e", "FOO", "-e", "HOSTNAME", "busybox", "env") | |||
| cmd.Env = []string{} | |||
| if os.Getenv("DOCKER_HOST") != "" { // retain DOCKER_TEST_HOST | |||
| cmd.Env = append(cmd.Env, fmt.Sprintf("DOCKER_HOST=%s", os.Getenv("DOCKER_HOST"))) | |||
There was a problem hiding this comment.
Why not just do:
cmd.Env = []string{
fmt.Sprintf("DOCKER_HOST=%s", daemonHost()),
}There was a problem hiding this comment.
it will include an extra unix://var/run/docker.sock even though it's not needed by default. I'm not sure if that's the desired behavior.
ahmetb
changed the title
For Windows, we run integration-cli with DOCKER_TEST_HOST env var b/c daemon is on some remote machine. This keeps the DOCKER_HOST set by bash scripts in the env. Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
|
+1 LGTM This approach will let us add TLS support to our test suite more easily later, too. |
|
LGTM! |
icecrime
pushed a commit
that referenced
this pull request
Feb 16, 2015
integration-cli: Preserve DOCKER_TEST_HOST in env-clearing tests
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For Windows, we run integration-cli with DOCKER_TEST_HOST env var b/c
daemon is on some remote machine. This keeps the DOCKER_HOST set by
bash scripts in the env.
Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com
Label:
#windowsCc: @tianon @unclejack @duglin @jfrazelle @icecrime