diff options
author | HÃ¥kon Hallingstad <hakon@verizonmedia.com> | 2019-09-13 09:27:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-13 09:27:59 +0200 |
commit | 17e89f8d585dfc297106cbc0a6e9fee4ce53d2d8 (patch) | |
tree | 5e7385d1dbdf3da5bb8a7f97e661bb0866aef5d4 /node-admin/src/main | |
parent | 5fd8f3b78bc5968290d4fb7cd316e8cecde95666 (diff) | |
parent | 2caf897b6d87dce098651328175a873e545d55f7 (diff) |
Merge pull request #10608 from vespa-engine/hakonhall/avoid-zpe-policy-files-in-public-docker-containers
Avoid ZPE policy files in public Docker containers
Diffstat (limited to 'node-admin/src/main')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java index aa537d4f69a..994257ea926 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java @@ -5,6 +5,7 @@ import com.google.common.net.InetAddresses; import com.yahoo.collections.Pair; import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.NodeType; +import com.yahoo.config.provision.SystemName; import com.yahoo.system.ProcessExecuter; import com.yahoo.vespa.hosted.dockerapi.Container; import com.yahoo.vespa.hosted.dockerapi.ContainerResources; @@ -26,6 +27,7 @@ import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.OptionalLong; import java.util.logging.Logger; @@ -304,7 +306,8 @@ public class DockerOperationsImpl implements DockerOperations { if (isInfrastructureHost(context.nodeType())) command.withSharedVolume(varLibSia, varLibSia); - if (context.nodeType() == NodeType.tenant) + boolean isMain = context.zone().getSystemName() == SystemName.cd || context.zone().getSystemName() == SystemName.main; + if (isMain && context.nodeType() == NodeType.tenant) command.withSharedVolume(Paths.get("/var/zpe"), context.pathInNodeUnderVespaHome("var/zpe")); } |