New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

integ-cli: also preserve SystemRoot env var #11223

Merged
merged 1 commit into from Mar 7, 2015

Conversation

Projects
None yet
5 participants
@ahmetb
Contributor

ahmetb commented Mar 7, 2015

Windows CI fails to dial remote test host over tcp in the test cases where
we clear environment variables during exec(dockerBinary, ...) in the
absence of SystemRoot environment variable (typically points to c:\windows).

This fixes tests:

  • TestRunEnvironmentErase
  • TestRunEnvironmentOverride
  • TestCliProxyDisableProxyUnixSock (#11216 should also be merged for this one to get fully fixed)

Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com
cc: @tianon @duglin

integ-cli: also preserve SystemRoot env var
Windows CI fails to dial remote test host over tcp in the test cases where
we clear environment variables during `exec(dockerBinary, ...)` in the
absence of `SystemRoot` environment variable (typically points to `c:\windows`).

This fixes tests:
- `TestRunEnvironmentErase`
- `TestRunEnvironmentOverride`

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
@duglin

This comment has been minimized.

Contributor

duglin commented Mar 7, 2015

If we wanted to be really picky we should conditionally add SystemRoot based on whether we're on Windows, but no harm I guess.
LGTM

@tianon

This comment has been minimized.

Member

tianon commented Mar 7, 2015

LGTM

@ahmetb

This comment has been minimized.

Contributor

ahmetb commented Mar 7, 2015

but no harm I guess.

@duglin true, it won't be there in posix systems. moreover, I really wonder why we need this one. I investigated the golang src and couldn't find anything but some google search results are saying if you unset SystemRoot, windows loses its ability to find and load DLLs, this might be the reason here.

duglin added a commit that referenced this pull request Mar 7, 2015

Merge pull request #11223 from ahmetalpbalkan/win-cli/preserve-SYSTEM…
…ROOT

integ-cli: also preserve SystemRoot env var

@duglin duglin merged commit 7967fc8 into moby:master Mar 7, 2015

1 check passed

janky Jenkins build Docker-PRs 2742 has succeeded
Details

@ahmetb ahmetb deleted the ahmetb:win-cli/preserve-SYSTEMROOT branch Mar 7, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment