Skip to content
This repository has been archived by the owner on Mar 31, 2022. It is now read-only.

Fix for Issue 64 #65

Merged
merged 6 commits into from
Sep 5, 2017
Merged

Fix for Issue 64 #65

merged 6 commits into from
Sep 5, 2017

Conversation

rlodge
Copy link
Contributor

@rlodge rlodge commented Aug 22, 2017

A proposed fix for issue #64 . Also adds the ability to configure the location of the docker configuration file if it's in a non-standard location.

@bkmeneguello
Copy link

This must be merged!

@dflemstr
Copy link
Contributor

dflemstr commented Sep 4, 2017

This looks reasonable but I would like the input from somebody else e.g. @davidxia wrt. the correct use of the docker-client.

Copy link
Member

@mattnworb mattnworb left a comment

Choose a reason for hiding this comment

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

LGTM overall. Thanks for the PR!

.password(server.getPassword())
.build();
}
return null;
Copy link
Member

Choose a reason for hiding this comment

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

Might be nice to log something here in case the user is expecting a Server to be found

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure.

@mattnworb mattnworb merged commit a0ef522 into spotify:master Sep 5, 2017
@mattnworb
Copy link
Member

@rlodge would you be willing to add something to the README and/or changelog describing how to use this?

@rlodge
Copy link
Contributor Author

rlodge commented Sep 5, 2017

Yes, I can give you another pull request against master with that. Something like:

In CHANGELOG.md

1.3.4 (unreleased)

and in README.md

Authenticating with maven settings.xml

Since version 1.3.4, you can authenticate using your maven settings.xml instead
of docker configuration. Just add configuration similar to:

<configuration>
  <repository>docker-repo.example.com:8080/organization/image</repository>
  <tag>latest</tag>
  <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
</configuration>

You can also use -Ddockerfile.useMavenSettingsForAuth=true on the command line.

Then, in your maven settings file, add configuration for the server:

<servers>
  <server>
    <id>docker-repo.example.com:8080</id>
    <username>me</username>
    <password>mypassword</password>
  </server>
</servers>

exactly as you would for any other server configuration.

Let me know if that sounds like what you're looking for.

@mattnworb
Copy link
Member

Looks perfect to me!

@rlodge
Copy link
Contributor Author

rlodge commented Sep 7, 2017

Ok. Added pull request #72 with the documentation.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants