summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@oath.com>2018-03-01 09:33:53 +0100
committerValerij Fredriksen <valerijf@oath.com>2018-03-01 12:38:42 +0100
commit54e05b2bf1dd64229a9233fdef87fe3b7fe7ba5b (patch)
tree4cbf3de0ca5535cef305c0810055347a52e74902 /node-admin
parentdf358608e3b15b12e49ebb93eef8b990b0700d87 (diff)
Set AuthConfig for image pull if credentials supplier is set
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java17
1 files changed, 6 insertions, 11 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java
index 6494037ec3e..6c9df440826 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java
@@ -6,9 +6,9 @@ import com.yahoo.vespa.hosted.dockerapi.ContainerName;
import com.yahoo.vespa.hosted.dockerapi.ContainerResources;
import com.yahoo.vespa.hosted.dockerapi.Docker;
import com.yahoo.vespa.hosted.dockerapi.DockerImage;
+import com.yahoo.vespa.hosted.dockerapi.DockerRegistryCredentialsSupplier;
import com.yahoo.vespa.hosted.dockerapi.ProcessResult;
-import java.io.File;
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Arrays;
@@ -59,11 +59,6 @@ public class DockerMock implements Docker {
}
@Override
- public void copyArchiveToContainer(String sourcePath, ContainerName destinationContainer, String destinationPath) {
-
- }
-
- @Override
public List<Container> getAllContainersManagedBy(String manager) {
synchronized (monitor) {
return new ArrayList<>(containersByContainerName.values());
@@ -135,11 +130,6 @@ public class DockerMock implements Docker {
}
@Override
- public void buildImage(File dockerfile, DockerImage dockerImage) {
-
- }
-
- @Override
public void deleteUnusedDockerImages() {
}
@@ -174,6 +164,11 @@ public class DockerMock implements Docker {
return "2001:db8:1:2:0:242:ac13:2";
}
+ @Override
+ public void setDockerRegistryCredentialsSupplier(DockerRegistryCredentialsSupplier dockerRegistryCredentialsSupplier) {
+
+ }
+
public static class StartContainerCommandMock implements CreateContainerCommand {
@Override
public CreateContainerCommand withLabel(String name, String value) {