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

cluster up: remove hardcoded docker root mount #12744

Merged
merged 1 commit into from
Feb 1, 2017

Conversation

csrwng
Copy link
Contributor

@csrwng csrwng commented Jan 31, 2017

Uses the docker root retrieved from docker info to mount that into
the origin container, instead of hardconding '/var/lib/docker'

Fixes #12111

@csrwng
Copy link
Contributor Author

csrwng commented Jan 31, 2017

@bparees ptal

@@ -258,6 +259,7 @@ func (h *Helper) Start(opt *StartOptions, out io.Writer) (string, error) {
binds = append(binds, fmt.Sprintf("%[1]s:%[1]s%[2]s", opt.HostVolumesDir, propagationMode))
}
env = append(env, opt.Environment...)
binds = append(binds, fmt.Sprintf("%[1]s:%[1]s", opt.DockerRoot))
Copy link
Contributor

Choose a reason for hiding this comment

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

where's the /var/lib/docker mount that this is replacing?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

arrgh, didn't remove it. It's at the beginning of this file. Will update.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated

Uses the docker root retrieved from docker info to mount that into
the origin container, instead of hardconding '/var/lib/docker'
@csrwng csrwng force-pushed the clusterup_mount_docker_root branch from d6f8478 to 08bfa3d Compare January 31, 2017 21:26
@bparees
Copy link
Contributor

bparees commented Jan 31, 2017

lgtm

@csrwng
Copy link
Contributor Author

csrwng commented Jan 31, 2017

[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 31, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/13461/) (Image: devenv-rhel7_5825)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 08bfa3d

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@bparees bparees self-assigned this Jan 31, 2017
@csrwng
Copy link
Contributor Author

csrwng commented Feb 1, 2017

flake #11315
[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 08bfa3d

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/13461/) (Base Commit: 6b6610a)

1 similar comment
@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/13461/) (Base Commit: 6b6610a)

@openshift-bot openshift-bot merged commit 753cbc8 into openshift:master Feb 1, 2017
@csrwng csrwng deleted the clusterup_mount_docker_root branch February 1, 2017 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants