Ignore unknown properties in .docker/config.json

jib-core/src/main/java/com/google/cloud/tools/jib/registry/credentials/json/DockerConfigTemplate.java

@@ -62,6 +62,7 @@
 public class DockerConfigTemplate implements JsonTemplate {
 
  /** Template for an {@code auth} defined for a registry under {@code auths}. */
+ @JsonIgnoreProperties(ignoreUnknown = true)
  private static class AuthTemplate implements JsonTemplate {
 
  @Nullable private String auth;
@@ -82,10 +83,15 @@ private static class AuthTemplate implements JsonTemplate {
  */
  @Nullable
  public String getAuthFor(String registry) {
- if (!auths.containsKey(registry)) {
- return null;
+ AuthTemplate registryAuth = auths.get(registry);
+ if (registryAuth == null) {
+ // The registry could be prefixed with the HTTPS protocol.
+ registryAuth = auths.get("https://" + registry);
+ }
+ if (registryAuth != null) {
+ return registryAuth.auth;
  }
- return auths.get(registry).auth;
+ return null;
  }
 
  /**

jib-core/src/test/java/com/google/cloud/tools/jib/registry/credentials/json/DockerConfigTemplateTest.java

@@ -39,6 +39,8 @@ public void test_fromJson() throws URISyntaxException, IOException {
 
  Assert.assertEquals("some auth", dockerConfigTemplate.getAuthFor("some registry"));
  Assert.assertEquals("some other auth", dockerConfigTemplate.getAuthFor("some other registry"));
+ Assert.assertEquals("token", dockerConfigTemplate.getAuthFor("registry"));
+ Assert.assertEquals("token", dockerConfigTemplate.getAuthFor("https://registry"));
  Assert.assertEquals(null, dockerConfigTemplate.getAuthFor("just registry"));
 
  Assert.assertEquals(

jib-core/src/test/resources/json/dockerconfig.json

@@ -1 +1 @@
-{"auths":{"some other registry":{"auth":"some other auth"},"some registry":{"auth":"some auth"},"just registry":{},"https://with.protocol":{}},"credsStore":"some credential store","credHelpers":{"another registry":"another credential helper","some registry":"some credential helper"}}
+{"auths":{"some other registry":{"auth":"some other auth"},"some registry":{"auth":"some auth","password":"ignored"},"https://registry":{"auth":"token"},"just registry":{},"https://with.protocol":{}},"credsStore":"some credential store","credHelpers":{"another registry":"another credential helper","some registry":"some credential helper"}}