<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0" xmlns:preprocess="properties">
  <jdisc id="node-admin" jetty="true" version="1.0">
    <!-- Please update container test when changing this file -->
    <accesslog type="vespa" fileNamePattern="logs/vespa/node-admin/access.log.%Y%m%d%H%M%S" rotationScheme="date" symlinkName="access.log" />
    <component id="docker-api" class="com.yahoo.vespa.hosted.dockerapi.DockerImpl" bundle="docker-api"/>
    <component id="metrics-wrapper" class="com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper" bundle="docker-api"/>

    <config name="vespa.hosted.dockerapi.docker">
      <uri>unix:///var/run/docker.sock</uri>
      <runContainersInPrivileged>true</runContainersInPrivileged>
    </config>

    <preprocess:include file="variant.xml" required="false"/>
  </jdisc>
</services>

<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0" xmlns:preprocess="properties">
  <container id="node-admin" version="1.0">
    <!-- Please update container test when changing this file -->
    <accesslog type="vespa" fileNamePattern="logs/vespa/node-admin/access.log.%Y%m%d%H%M%S" rotationScheme="date" symlinkName="access.log" />
    <component id="docker-api" class="com.yahoo.vespa.hosted.dockerapi.DockerImpl" bundle="docker-api"/>
    <component id="metrics-wrapper" class="com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper" bundle="docker-api"/>

    <config name="vespa.hosted.dockerapi.docker">
      <uri>unix:///var/run/docker.sock</uri>
      <runContainersInPrivileged>true</runContainersInPrivileged>
    </config>

    <preprocess:include file="variant.xml" required="false"/>
  </container>
</services>

Use container instead of jdisc
Use container instead of jdisc
