summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2018-11-30 12:28:19 +0100
committerGitHub <noreply@github.com>2018-11-30 12:28:19 +0100
commit21bf7a18cbe61b680b328265f9556eb0967f7bb5 (patch)
treee8adcb2335f58d0a84c48cc6c9ddc95f693b3630
parentc39220816b20a033b7604e7502426066927db4ae (diff)
parentc88c2f0d874a76944587a2eb641dda7ad8a4400e (diff)
Merge pull request #7821 from vespa-engine/hakonhall/preserve-docker-containers-etcvespaflags-over-restarts
Preserve Docker container's /etc/vespa/flags over restarts
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java1
1 files changed, 1 insertions, 0 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 d6b370c4ec2..910c94c54b1 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
@@ -273,6 +273,7 @@ public class DockerOperationsImpl implements DockerOperations {
// Paths unique to each container
List<Path> paths = new ArrayList<>(Arrays.asList(
+ Paths.get("/etc/vespa/flags"),
Paths.get("/etc/yamas-agent"),
context.pathInNodeUnderVespaHome("logs/daemontools_y"),
context.pathInNodeUnderVespaHome("logs/jdisc_core"),