diff options
author | Valerij Fredriksen <valerijf@oath.com> | 2018-08-29 20:06:03 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerij92@gmail.com> | 2018-08-29 20:30:24 +0200 |
commit | 103516173220c9bb845a9fdbf3113ed986816e51 (patch) | |
tree | 42ddb3ca94df3affb6d9517b76dfdcec5bceb013 /docker-api | |
parent | dbc86be22dad1d9fb279d978a45e621a5325ca7e (diff) |
Remove option to set docker registry credentials supplier
Diffstat (limited to 'docker-api')
4 files changed, 1 insertions, 60 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java index 6c9c456d858..fc7282e2be5 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java @@ -116,10 +116,4 @@ public interface Docker { ProcessResult executeInContainerAsRoot(ContainerName containerName, Long timeoutSeconds, String... command); String getGlobalIPv6Address(ContainerName name); - - /** - * If set, the supplier will we called every time before a pull/push request is made to get the credentials - */ - void setDockerRegistryCredentialsSupplier(DockerRegistryCredentialsSupplier dockerRegistryCredentialsSupplier); - } diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java index 5be5f69f5bc..3d01552b21e 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java @@ -8,11 +8,9 @@ import com.github.dockerjava.api.command.InspectContainerCmd; import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.command.InspectExecResponse; import com.github.dockerjava.api.command.InspectImageResponse; -import com.github.dockerjava.api.command.PullImageCmd; import com.github.dockerjava.api.exception.DockerClientException; import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.exception.NotModifiedException; -import com.github.dockerjava.api.model.AuthConfig; import com.github.dockerjava.api.model.Image; import com.github.dockerjava.api.model.Network; import com.github.dockerjava.api.model.Statistics; @@ -69,8 +67,6 @@ public class DockerImpl implements Docker { @GuardedBy("monitor") private final Set<DockerImage> scheduledPulls = new HashSet<>(); - private volatile Optional<DockerRegistryCredentialsSupplier> dockerRegistryCredentialsSupplier = Optional.empty(); - private DockerClient dockerClient; @Inject @@ -154,19 +150,10 @@ public class DockerImpl implements Docker { if (imageIsDownloaded(image)) return false; scheduledPulls.add(image); - PullImageCmd pullImageCmd = dockerClient.pullImageCmd(image.asString()); - - dockerRegistryCredentialsSupplier - .flatMap(credentialsSupplier -> credentialsSupplier.getCredentials(image)) - .map(credentials -> new AuthConfig() - .withRegistryAddress(credentials.registry.toString()) - .withUsername(credentials.username) - .withPassword(credentials.password)) - .ifPresent(pullImageCmd::withAuthConfig); logger.log(LogLevel.INFO, "Starting download of " + image.asString()); - pullImageCmd.exec(new ImagePullCallback(image)); + dockerClient.pullImageCmd(image.asString()).exec(new ImagePullCallback(image)); return true; } } catch (RuntimeException e) { @@ -381,11 +368,6 @@ public class DockerImpl implements Docker { return cmd.exec().getNetworkSettings().getGlobalIPv6Address(); } - @Override - public void setDockerRegistryCredentialsSupplier(DockerRegistryCredentialsSupplier dockerRegistryCredentialsSupplier) { - this.dockerRegistryCredentialsSupplier = Optional.of(dockerRegistryCredentialsSupplier); - } - private Stream<Container> asContainer(String container) { return inspectContainerCmd(container) .map(response -> diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerRegistryCredentials.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerRegistryCredentials.java deleted file mode 100644 index c9603e9e53a..00000000000 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerRegistryCredentials.java +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.dockerapi; - -import java.net.URI; - -/** - * @author freva - */ -public class DockerRegistryCredentials { - public final URI registry; - public final String username; - public final String password; - - public DockerRegistryCredentials(URI registry, String username, String password) { - this.registry = registry; - this.username = username; - this.password = password; - } -} diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerRegistryCredentialsSupplier.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerRegistryCredentialsSupplier.java deleted file mode 100644 index 6f16a6cd545..00000000000 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerRegistryCredentialsSupplier.java +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.dockerapi; - -import java.util.Optional; - -/** - * @author freva - */ -public interface DockerRegistryCredentialsSupplier { - - /** - * Returns credentials to docker registry needed to be able to pull/push given - * docker image. - */ - Optional<DockerRegistryCredentials> getCredentials(DockerImage dockerImage); -} |