Skip to content
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

Add ability for worker to bind to local docker socket for testing exports #112

Merged
merged 1 commit into from Feb 13, 2018

Conversation

elliott-davis
Copy link
Contributor

@elliott-davis elliott-davis commented Jan 26, 2018

tenor-233124008

Closes: #117

Signed-off-by: Travis Elliott Davis edavis@chef.io

@thesentinels
Copy link
Contributor

Thanks for the pull request! Here is what will happen next:

  1. Your PR will be reviewed by the maintainers
  2. If everything looks good, one of them will approve it, and your PR will be merged.

Thank you for contributing!

@elliott-davis elliott-davis changed the title WIP: Add ability for worker to bind to local docker socket for testing exports Add ability for worker to bind to local docker socket for testing exports Jan 29, 2018
@@ -145,7 +145,12 @@ impl<'a> DockerExporter<'a> {
);
cmd.env(DOCKER_HOST_ENVVAR, sock); // Use the job-specific `dockerd`
cmd.stdout(Stdio::piped());
cmd.stderr(Stdio::piped());
match env::var_os(DEV_MODE) {
Some(_) => debug!("Not exporting in dev mode"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sneaky :) Maybe put in a comment that this part is a workaround for now until we solve the streaming log problem correctly?

@@ -104,7 +104,12 @@ impl<'a> Studio<'a> {
}
}
cmd.stdout(Stdio::piped());
cmd.stderr(Stdio::piped());
match env::var_os(DEV_MODE) {
Some(_) => debug!("Studio not displaying stderr"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

@@ -97,43 +97,46 @@ impl<'a> Studio<'a> {
cmd.env("PATH", env::var("PATH").unwrap_or(String::from(""))); // Sets `$PATH`
cmd.env(NONINTERACTIVE_ENVVAR, "true"); // Disables progress bars
cmd.env("TERM", "xterm-256color"); // Emits ANSI color codes
// propagate debugging environment variables into Airlock and Studio
// propagate debugging environment variables into Airlock and Studio
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the spacing intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rustfmt did that

…orts

Signed-off-by: Travis Elliott Davis <edavis@chef.io>
@elliott-davis elliott-davis merged commit e6c6a62 into master Feb 13, 2018
@elliott-davis elliott-davis deleted the elliott/local_worker branch February 13, 2018 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants