Add additional devc properties to metadata file

OpenLiberty · Oct 31, 2023 · e69e5a3 · e69e5a3
1 parent d5b02e9
commit e69e5a3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/main/java/io/openliberty/tools/common/plugins/util/DevUtil.java b/src/main/java/io/openliberty/tools/common/plugins/util/DevUtil.java
@@ -5701,13 +5701,22 @@ public void writeDevcMetadata(boolean alive) {
             metadataWriter.writeStartElement("devcModeMetaData");
             writeElement(metadataWriter, "containerEngine", isDocker ? DEVC_CONTAINER_DOCKER : DEVC_CONTAINER_PODMAN);
             writeElement(metadataWriter, "containerName", containerName != null ? containerName : DEVMODE_CONTAINER_BASE_NAME);
+            writeElement(metadataWriter, "imageName", imageName);
+            if (containerfile != null) {
+                writeElement(metadataWriter, "containerfile", containerfile.getCanonicalPath());
+            }
+            if (containerBuildContext != null) {
+                writeElement(metadataWriter, "containerBuildContext", containerBuildContext.getCanonicalPath());
+            }
             writeElement(metadataWriter, "containerAlive", String.valueOf(alive));
+            writeElement(metadataWriter, "containerBuildTimeout", Integer.toString(containerBuildTimeout));
+            writeElement(metadataWriter, "containerRunOpts", containerRunOpts);
             metadataWriter.writeEndElement();
             metadataWriter.writeEndDocument();
             metadataWriter.flush();
             metadataWriter.close();
         } catch (Exception e) {
-            warn("Failed to write metadata.");
+            warn("Failed to write metadata.\n" + e.getMessage());
         }
     }
 

diff --git a/src/test/java/io/openliberty/tools/common/plugins/util/DevUtilTest.java b/src/test/java/io/openliberty/tools/common/plugins/util/DevUtilTest.java
@@ -539,10 +539,18 @@ public void testWriteDevcMetadataSimple() throws XMLStreamException, FactoryConf
         String content = FileUtils.readFileToString(metaDataXml, "UTF-8");
         assertTrue(content.contains("<containerName>liberty-dev</containerName"));
         assertTrue(content.contains("<containerAlive>true</containerAlive>"));
+        assertTrue(content.contains("<containerBuildTimeout>600</containerBuildTimeout>"));
+        assertTrue(content.contains("<containerEngine>docker</containerEngine>"));
+        assertTrue(content.contains("<containerRunOpts></containerRunOpts>"));
+        assertTrue(content.contains("<imageName></imageName>"));
 
         util.writeDevcMetadata(false);
         content = FileUtils.readFileToString(metaDataXml, "UTF-8");
         assertTrue(content.contains("<containerName>liberty-dev</containerName"));
         assertTrue(content.contains("<containerAlive>false</containerAlive>"));
+        assertTrue(content.contains("<containerBuildTimeout>600</containerBuildTimeout>"));
+        assertTrue(content.contains("<containerEngine>docker</containerEngine>"));
+        assertTrue(content.contains("<containerRunOpts></containerRunOpts>"));
+        assertTrue(content.contains("<imageName></imageName>"));
     }
 }