diff options
author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-06-08 13:20:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-08 13:20:35 +0200 |
commit | 25809a32e2a9227d92e355483984e9ba592358f4 (patch) | |
tree | 6b8a36cf15cf7718e95ce40fbba128960e0a4858 /docker-api | |
parent | 7b2cbc0dab1cbdabb209c0a92566f3682334febb (diff) | |
parent | 3ccff246aa757000db84711949d1486dc7344198 (diff) |
Merge pull request #2670 from yahoo/arnej/less-hardcoded-yahoo
Arnej/less hardcoded yahoo
Diffstat (limited to 'docker-api')
-rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java index 4e26efa97b2..3391f524ec7 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java @@ -49,9 +49,9 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.Stream; +import static com.yahoo.vespa.defaults.Defaults.getDefaults; import static com.yahoo.vespa.hosted.dockerapi.DockerNetworkCreator.NetworkAddressInterface; - public class DockerImpl implements Docker { private static final Logger logger = Logger.getLogger(DockerImpl.class.getName()); @@ -225,7 +225,7 @@ public class DockerImpl implements Docker { @Override public ProcessResult executeInContainer(ContainerName containerName, String... args) { - return executeInContainerAsUser(containerName, "yahoo", Optional.empty(), args); + return executeInContainerAsUser(containerName, getDefaults().vespaUser(), Optional.empty(), args); } @Override |