Merge pull request #5180 from vespa-engine/freva/docker-auth

Docker auth for image pull

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) {