From 6b9f411a42f6f0868e75e2133debe68c00dc4825 Mon Sep 17 00:00:00 2001 From: roleyfoley Date: Fri, 18 Dec 2020 04:49:28 +0000 Subject: [PATCH] fix: dind hostname and image details --- providers/shared/extensions/dind/extension.ftl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/providers/shared/extensions/dind/extension.ftl b/providers/shared/extensions/dind/extension.ftl index bad2dc2fe..78f10f8ea 100644 --- a/providers/shared/extensions/dind/extension.ftl +++ b/providers/shared/extensions/dind/extension.ftl @@ -27,7 +27,7 @@ [#assign settings = _context.DefaultEnvironment] - [@Hostname hostname=_context.Name /] + [@Hostname hostname=(_context.Name)?replace("_", "") /] [#local dockerStageDir = settings["DOCKER_STAGE_DIR"]!"/home/jenkins" ] [#local dockerStageSize = settings["DOCKER_STAGE_SIZE_GB"]!"20" ] @@ -35,6 +35,12 @@ [#local dockerLibSize = settings["DOCKER_LIB_VOLUME_SIZE"]!"20" ] [#local dindTLSVerify = settings["DIND_DOCKER_TLS_VERIFY"]!"true" ] + + [@Attributes + image="docker" + version="dind" + /] + [#if dindTLSVerify?boolean ] [@Settings {