add hostname to packer image name

bubble-server/src/main/java/bubble/service/packer/PackerJob.java

@@ -43,19 +43,27 @@ import static org.cobbzilla.util.io.StreamUtil.copyClasspathDirectory;
 import static org.cobbzilla.util.io.StreamUtil.stream2string;
 import static org.cobbzilla.util.json.JsonUtil.json;
 import static org.cobbzilla.util.network.NetworkUtil.getExternalIp;
+import static org.cobbzilla.util.system.CommandShell.hostname;
 
 @Slf4j
 public class PackerJob implements Callable<List<PackerImage>> {
 
     public static final AnsibleInstallType[] PACKER_TYPES = {AnsibleInstallType.sage, AnsibleInstallType.node};
-    public static final String INSTALL_TYPE_VAR = "@@TYPE@@";
     public static final String PACKER_TEMPLATE = PACKER_DIR+"/packer.json.hbs";
     public static final String PACKER_IMAGE_NAME_VAR = "packerImageName";
     public static final String PACKER_IMAGE_PREFIX = "packer_bubble_";
+
+    public static final String INSTALL_TYPE_VAR = "@@TYPE@@";
     public static final String BUBBLE_VERSION_VAR = "@@BUBBLE_VERSION@@";
+    public static final String SAGE_HOST_VAR = "@@SAGE_HOST@@";
     public static final String PACKER_KEY_VAR = "@@PACKER_KEY_HASH@@";
     public static final String JAR_SHA_VAR = "@@JAR_SHA256@@";
-    public static final String PACKER_IMAGE_NAME_TEMPLATE = PACKER_IMAGE_PREFIX+INSTALL_TYPE_VAR+"_"+PACKER_KEY_VAR+"_"+BUBBLE_VERSION_VAR+"_"+JAR_SHA_VAR;
+    public static final String PACKER_IMAGE_NAME_TEMPLATE = PACKER_IMAGE_PREFIX + INSTALL_TYPE_VAR
+            + "_" + SAGE_HOST_VAR
+            + "_" + PACKER_KEY_VAR
+            + "_" + BUBBLE_VERSION_VAR
+            + "_" + JAR_SHA_VAR;
+
     public static final String VARIABLES_VAR = "packerVariables";
     public static final String BUILD_REGION_VAR = "buildRegion";
     public static final String IMAGE_REGIONS_VAR = "imageRegions";
@@ -184,6 +192,7 @@ public class PackerJob implements Callable<List<PackerImage>> {
                 .replace(INSTALL_TYPE_VAR, installType.name())
                 .replace(BUBBLE_VERSION_VAR, configuration.getVersion())
                 .replace(PACKER_KEY_VAR, packerService.getPackerPublicKeyHash())
+                .replace(SAGE_HOST_VAR, hostname())
                 .replace(JAR_SHA_VAR, jarSha);
         ctx.put(PACKER_IMAGE_NAME_VAR, imageName);