diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2018-03-02 14:18:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-02 14:18:47 +0100 |
commit | 8ec5743e254b039fe860339fdc4b5ab4aa1f0364 (patch) | |
tree | 4dde75a82e31e4c91527cc8319cbf895af1b9665 /node-admin/src | |
parent | f729e9465f18924b05eb9c652bdf4bbc6052f08a (diff) | |
parent | 54e05b2bf1dd64229a9233fdef87fe3b7fe7ba5b (diff) |
Merge pull request #5180 from vespa-engine/freva/docker-auth
Docker auth for image pull
Diffstat (limited to 'node-admin/src')
-rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java | 17 |
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) { |