Skip to content

Commit 5b48bce

Browse files
committed
Add authconfigs to client, add logging
1 parent 44cd26e commit 5b48bce

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

client/src/main/java/dev/snowdrop/buildpack/docker/AuthDelegatingDockerClientConfig.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
import java.util.List;
44

5+
import org.slf4j.Logger;
6+
import org.slf4j.LoggerFactory;
7+
58
import com.github.dockerjava.api.model.AuthConfig;
69
import com.github.dockerjava.core.DockerClientConfig;
710
import com.github.dockerjava.core.DockerClientConfigDelegate;
@@ -11,6 +14,8 @@
1114

1215
class AuthDelegatingDockerClientConfig extends DockerClientConfigDelegate {
1316

17+
private static final Logger log = LoggerFactory.getLogger(AuthDelegatingDockerClientConfig.class);
18+
1419
private List<RegistryAuthConfig> registryAuthInfo;
1520

1621
public AuthDelegatingDockerClientConfig(DockerClientConfig delegate) {
@@ -23,20 +28,26 @@ public void setRegistryAuthConfigs(List<RegistryAuthConfig> registryAuthInfo) {
2328

2429
@Override
2530
public AuthConfig effectiveAuthConfig(String imageName) {
31+
log.debug("Resolving authentication configuration for image "+imageName);
2632
AuthConfig fallbackAuthConfig;
2733
try {
2834
fallbackAuthConfig = super.effectiveAuthConfig(imageName);
35+
log.debug("fallback config retrieved");
2936
} catch (Exception e) {
3037
fallbackAuthConfig = new AuthConfig();
38+
log.debug("no fallback config available");
3139
}
3240

3341
// try and obtain more accurate auth config using our resolution
3442
final ImageReference parsed = new ImageReference(imageName);
3543
String address = parsed.getPort()!=null ? parsed.getHost()+":"+parsed.getPort() : parsed.getHost();
44+
45+
log.debug("Checking configuration for auth config for address "+address);
3646

3747
if(registryAuthInfo!=null) {
3848
for(RegistryAuthConfig rac : registryAuthInfo){
3949
if(address.equals(rac.getRegistryAddress())){
50+
log.debug("found match, configuring");
4051
return new AuthConfig()
4152
.withAuth(rac.getAuth())
4253
.withEmail(rac.getEmail())
@@ -49,6 +60,7 @@ public AuthConfig effectiveAuthConfig(String imageName) {
4960
}
5061
}
5162

63+
log.debug("no match, using fallback if available");
5264
return fallbackAuthConfig;
5365
}
5466
}

client/src/main/java/dev/snowdrop/buildpack/docker/DockerClientUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public static DockerClient getDockerClient(HostAndSocket runtimeInfo, List<Regis
5555
.build();
5656

5757
AuthDelegatingDockerClientConfig addcc = new AuthDelegatingDockerClientConfig(config);
58+
addcc.setRegistryAuthConfigs(authConfigs);
5859

5960
DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder()
6061
.dockerHost(config.getDockerHost())

0 commit comments

Comments
 (0)