2 files changed, 7 insertions, 2 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerName.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerName.java
index a7553bf076f..b29ceb69ce1 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerName.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerName.java
@@ -26,7 +26,7 @@ public class ContainerName {
     }
 
     public static ContainerName fromHostname(final String hostName) {
-        return new ContainerName(hostName.split("\\.")[0]);
+        return new ContainerName(hostName.split("\\.", 2)[0]);
     }
 
     @Override
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ContainerNameTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ContainerNameTest.java
index ca53a0f5235..cace96ab207 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ContainerNameTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ContainerNameTest.java
@@ -6,7 +6,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
 /**
- * @author valerijf
+ * @author freva
  */
 public class ContainerNameTest {
     @Test
@@ -23,6 +23,11 @@ public class ContainerNameTest {
         assertEquals(containerName.asString(), name);
     }
 
+    @Test
+    public void testContainerNameFromHostname() {
+        assertEquals(new ContainerName("container-123"), ContainerName.fromHostname("container-123.sub.domain.tld"));
+    }
+
     @Test(expected=IllegalArgumentException.class)
     public void testAlphanumericalWithSlashContainerName() {
         new ContainerName("container/123");