Make beaker-docker work in a docker container #2
Conversation
The solution is pretty simple: I check if I'm currently in a container and then I choose the `Gateway` ip.
|
Can one of the admins verify this patch? |
|
@Ananasr, we follow beaker's contributing guideline for all our hypervisor libraries. Would you mind filing a ticket and also describing the problem in detail for us to review this patch? |
|
Also what do you think about fixing the port mapping in the first place itself? I made this change on my fork. Docker changes the port mapping for port 22 every time the container restarts. It would be easier for us to just hardcode this mapping to a random port during the creation of the container so that it would not change on restart and it'd be easy for us to SSH. |
|
Can you show me a use case where the current port mapping is a problem ? |
|
This test will fail with how we map port currently. |
|
This fix the problem of rebooting ! Cool ! |
|
@Ananasr I still don't understand the problem you were trying to solve. Does the patch i proposed fixes it? In that case I can create a ticket for my patch and submit a PR for that. |
|
If I try to use |
|
Ahh so there are two problems here:
Right? If so, we should file a ticket for both and submit PRs following the contributing guidelines for them to be verified. |
|
Exactly ! I'll file a ticket now ! |
|
Here is my ticket https://tickets.puppetlabs.com/browse/BKR-1186 |
|
@Ananasr couple more steps to go:
|
|
I'v some questions about writing spec tests, where can I find help ? |
It was impossible to run beaker-docker inside a container because it try to connect with SSH to 0.0.0.0 which is the container @ip, not the host. To fix this, we can tell to beaker-docker to connect at the gateway IP which is the host. - this commit add spec test and fix the commit message ;)
|
@Ananasr this looks good! Kicking off CI |
|
@puppetlabs-jenkins test this please |
lib/beaker/hypervisor/docker.rb
Outdated
| @@ -332,5 +336,10 @@ def find_container(host) | |||
| end.first | |||
| end | |||
|
|
|||
| # return true if we are inside a docker container | |||
| def am_i_in_container | |||
There was a problem hiding this comment.
in ruby we use the convention of using ? if it's a method that returns a boolean. So if you were to change this method name to in_container?, I think everything else looks great!
sorry for being a but nit picky about this.
There was a problem hiding this comment.
No problem @rishijavia ! I'll fix this right now !
change "am_i_in_container" to "in_container?" to respect ruby convention.
fix wrong call to in_container? method
|
@puppetlabs-jenkins retest this please |
Hey ! Please review and let me know what you think!