diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-09-18 15:53:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-18 15:53:40 +0200 |
| commit | b6a52c8fda45d7d3f45a8606b419b5f4becfbaed (patch) | |
| tree | 36ade4b419be773ca8e658491b8f5d581a06f105 | |
| parent | 48272e7af2589989361a4bdc13f57fddc7f3a09e (diff) | |
| parent | 823e2211b716ae71a6ae4b3e55141ae53ed4001b (diff) | |
Merge pull request #10703 from vespa-engine/hakonhall/make-docker-version-flag
Make docker-version flag MERGEOK
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index e6bb7d9bdf5..5893e473965 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -60,6 +60,14 @@ public class Flags { "Takes effect on next host admin tick", HOSTNAME, NODE_TYPE); + public static final UnboundStringFlag DOCKER_VERSION = defineStringFlag( + "docker-version", "1.13.1-91.git07f3374", + "The version of the docker to use of the format VERSION-REL: The YUM package to be installed will be " + + "2:docker-VERSION-REL.el7.centos.x86_64 in AWS (and without '.centos' otherwise). " + + "If docker-version is not of this format, it must be parseable by YumPackageName::fromString.", + "Takes effect on next tick.", + HOSTNAME); + public static final UnboundLongFlag THIN_POOL_GB = defineLongFlag( "thin-pool-gb", -1, "The size of the disk reserved for the thin pool with dynamic provisioning in AWS, in base-2 GB. " + |