Fix alpine socket bug #290
Conversation
In case of an UnsatisfiedLinkError (which will happen if needed system libraries are missing) when trying to access Docker via Unix socket, a proxied Unix socket is used as a fallback on Linux instead.
The deciding factor of the HostPortWaitStrategy is the OS name and not the used DockerClientProviderStrategy. However please note, that the existing mac workaround might not work if using images that don't contain bash or sh.
| @@ -33,7 +33,7 @@ protected void waitUntilReady() { | |||
| Callable<Boolean> checkStrategy; | |||
|
|
|||
| // Special case for Docker for Mac, see #160 | |||
| if (DockerClientFactory.instance().isUsing(ProxiedUnixSocketClientProviderStrategy.class)) { | |||
| if (System.getProperty("os.name").toLowerCase().contains("mac")) { | |||
There was a problem hiding this comment.
this might break docker-machine + Mac. IMO "and" logic is more appropriate here
There was a problem hiding this comment.
I don't think that this will break mac compatibility (the usage of ProxiedUnixSocketClientProviderStrategy is determined by the same check), but since there are no automated mac tests, playing it safe might be more sensible here?
There was a problem hiding this comment.
only Docker for Mac's port checking is broken, this is why we check here. Docker Machine works fine
There was a problem hiding this comment.
I see, I'll change it accordingly then.
.travis.yml
Outdated
| -v /var/run/docker.sock:/var/run/docker.sock \ | ||
| -v "$(pwd)":"$(pwd)" \ | ||
| -w "$(pwd)" \ | ||
| joepjoosten/openjdk-alpine-bash \ |
There was a problem hiding this comment.
":latest" + 3rd party image. @rnorth maybe it's time to create testcontainers org on Docker Hub?
There was a problem hiding this comment.
We could remove this test as well, but I thought this might be a helpful regression test for alpine compatibility. The image itself is very simple however, so we could easily implement our own version.
There was a problem hiding this comment.
Please could you pin to a specific tag at least for now?
I absolutely would like to set up our own images for everything - maybe a separate conversation right now though. IIRC someone is squatting on the name testcontainers (for more than a year), which sucks :(
There was a problem hiding this comment.
Sadly this image does not provide any tags. If you like I can setup my own version of this image and freeze a version tag.
| if (!System.getProperty("os.name").toLowerCase().contains("mac")) { | ||
| throw new InvalidConfigurationException("this strategy is only applicable to OS X"); | ||
| String osName = System.getProperty("os.name").toLowerCase(); | ||
| if (!osName.contains("mac") && !osName.contains("linux")) { |
There was a problem hiding this comment.
We could switch logic and check for Windows.
|
This is looking great, thanks. Let's aim to merge tomorrow, and I'll release tomorrow night. |
|
Just testing locally then will merge |
|
Merged manually- thanks! |
In case of an UnsatisfiedLinkError (which will happen if needed system libraries are missing) when trying to access Docker via Unix socket, a proxied Unix socket is used as a fallback on Linux instead. In addition, the check for determining the concrete HostPortWaitStrategy behavior now depends on mac as an OS.
However please note, that the existing mac workaround might not work if using images that don't contain bash or sh.