WIP: Docker authentiation using credential store/helpers by rnorth · Pull Request #647 · testcontainers/testcontainers-java

rnorth · 2018-04-18T19:59:59Z

Not quite ready for review yet, but nearly.

This change adds support for docker's credential store/helper mechanism.

The main gap at the moment is Windows support; it may work, but I've not tried it. The tests so far definitely don't work on Windows.

bsideup

😍 wow, will be so cool to have it once we figure out the edge cases!

bsideup · 2018-04-19T08:52:08Z

CHANGELOG.md

 - Fixed missing `commons-codec` dependency ([\#642](https://github.com/testcontainers/testcontainers-java/issues/642))
 - Fixed `HostPortWaitStrategy` throws `NumberFormatException` when port is exposed but not mapped ([\#640](https://github.com/testcontainers/testcontainers-java/issues/640))
 - Fixed log processing: multibyte unicode, linebreaks and ASCII color codes. Color codes can be turned on with `withRemoveAnsiCodes(false)` ([PR \#643](https://github.com/testcontainers/testcontainers-java/pull/643))
+- Add support for private repositories using docker credential stores/helpers (fixes [\#567](https://github.com/testcontainers/testcontainers-java/issues/567))


aren't we link PRs here? :) Maybe next to "fixes" part, useful to check what was changed

bsideup · 2018-04-19T08:56:41Z

core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java

+     * @param defaultAuthConfig an AuthConfig object that should be returned if there is no overriding authentication
+     *                          available for images that are looked up
+     */
+    public RegistryAuthLocator(AuthConfig defaultAuthConfig) {


IMO this ctor should call

this(defaultAuthConfig, new File(System.getProperty("user.home") + "/.docker/config.json"), "")

bsideup · 2018-04-19T08:58:12Z

core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java

+     */
+    public RegistryAuthLocator(AuthConfig defaultAuthConfig) {
+        this.defaultAuthConfig = defaultAuthConfig;
+        this.configFile = new File(System.getProperty("user.home") + "/.docker/config.json");


https://github.com/moby/moby/blob/131e2bf12b2e1b3ee31b628a501f96bbb901f479/cliconfig/config.go#L29

it seems that the location is configurable. Not sure we can detect it tho

Well... I guess we can do a best-efforts detection of the location using the DOCKER_CONFIG env var. I'll add that.

See also DefaultDockerClientConfig::dockerConfigPath field

bsideup · 2018-04-19T09:01:24Z

core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java

+
+    private AuthConfig authConfigUsingCredentialsStoreOrHelper(String hostName, JsonNode config) throws Exception {
+
+        final String credsStoreName = config.at("/credsStore").asText();


FYI asText() returns "null" instead of null when it's null :)

Also, config.path("/credsStore") should be faster (doesn't parse the json path, but keeps the null safety by returning a missing node), but not critical here :)

Good point - will update

rnorth · 2018-04-30T17:41:26Z

I'll try and test this on Windows tonight, then I think we should be good to go.

rnorth · 2018-05-18T10:29:08Z

I've added the help wanted label because:

I've not been able to test this on Windows yet, and if a Windows user has time to test, and revise/add to the JUnit tests for this feature, we can ship this quicker
I'm aware that this will not work with docker-compose in anything other than 'local compose' mode. This doesn't feel like a blocker to me (we could address this later) but if anyone has thoughts on this limitation or ways to address it'd be good to hear.

bsideup · 2018-05-18T10:32:42Z

@rnorth Remember our discussion about containerised Compose? Maybe this is a great moment to finally make a decision and remove it? :)

kiview · 2018-05-18T11:02:15Z

I'd be fine with removing dockerized compose, it promises to be easy for user, but it adds a lot of additional hidden complexity, which can lead to strange edge cases.

I can test this on Windows this weekend though :)

TheIndifferent · 2018-05-30T09:06:52Z

core/src/main/java/org/testcontainers/utility/RegistryAuthLocator.java

+            final String reposName = dockerImageName.getRegistry();
+            final JsonNode auths = config.at("/auths/" + reposName);
+
+            if (!auths.isMissingNode() && auths.size() == 0) {


I've tested this with Docker-for-Mac, works perfectly fine if changed to || here.

I wonder if !auths.isMissingNode() is needed here, maybe just auths.size() == 0 is enough?

Checked Jackson source code, should be safe to leave size() == 0 only, but I do not think it matters that much, leaving both of them should be fine too.

TheIndifferent · 2018-05-30T09:14:30Z

Small comment on how to make it work with Docker-for-Mac, other than that works like charm! So, gentle ping to continue the progress :)

TheIndifferent · 2018-06-01T15:19:39Z

I tried to test this on Windows myself, but seems like Docker-for-Windows does not work on official MSEdge - Win10 for VirtualBox. @kiview all hopes is on you now.

rnorth · 2018-06-10T19:22:11Z

Closed in favour of #729


		private AuthConfig authConfigUsingCredentialsStoreOrHelper(String hostName, JsonNode config) throws Exception {

		final String credsStoreName = config.at("/credsStore").asText();

Uh oh!

Conversation

rnorth commented Apr 18, 2018

Uh oh!

bsideup left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rnorth commented Apr 30, 2018

Uh oh!

rnorth commented May 18, 2018

Uh oh!

bsideup commented May 18, 2018

Uh oh!

kiview commented May 18, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TheIndifferent commented May 30, 2018

Uh oh!

TheIndifferent commented Jun 1, 2018

Uh oh!

rnorth commented Jun 10, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

bsideup left a comment •

edited

Loading