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

Docker better #1366

Merged
merged 12 commits into from Nov 22, 2014
Merged

Docker better #1366

merged 12 commits into from Nov 22, 2014

Conversation

benallard
Copy link
Contributor

Few fixes around the DockerLatentSlave

def _image_exists(self, client):
def _image_exists(self, client, name=None):
if name is None:
name = self.image
# Make sure the container exists
Copy link
Contributor

Choose a reason for hiding this comment

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

[typo] image

@sa2ajj
Copy link
Contributor

sa2ajj commented Nov 19, 2014

pep8 problems.

@benallard
Copy link
Contributor Author

Travis says it's ok (yes it does).

@sa2ajj
Copy link
Contributor

sa2ajj commented Nov 19, 2014

LGTM

@sa2ajj
Copy link
Contributor

sa2ajj commented Nov 19, 2014

I'd appreciate at least another pair of eyes.

(One build did not want to succeed).


if not self._image_exists(docker_client):
if (not self._image_exists(docker_client, image)):
Copy link
Contributor

Choose a reason for hiding this comment

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

@benallard yes, it's a merge and here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

... :magic: ...

self.volumes.append(volume)

ro = False
if bind.endswith(':ro'):
Copy link
Contributor

Choose a reason for hiding this comment

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

What about :rw that is suggested to be possible in the user guide?

@sa2ajj
Copy link
Contributor

sa2ajj commented Nov 20, 2014

(I keep "needs more review" since I want to look at it tomorrow morning with a fresh eye)

@@ -27,90 +29,123 @@
from buildbot.buildslave import AbstractLatentBuildSlave

try:
import docker
Copy link
Contributor

Choose a reason for hiding this comment

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

Why would you need this??

Copy link
Contributor Author

Choose a reason for hiding this comment

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

To address the exception by name.

EDIT: line184

sa2ajj pushed a commit that referenced this pull request Nov 22, 2014
@sa2ajj sa2ajj merged commit 326b8ff into buildbot:master Nov 22, 2014
@benallard benallard deleted the docker_better branch November 22, 2014 22:07
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.

None yet

2 participants