Merge pull request #30597 from KyleAure/revert-revert-30300-relocate-…

…dockerfiles

dev/build.example.testcontainers_fat/fat/src/com/ibm/ws/testcontainers/example/ProgrammaticImageTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021, 2024 IBM Corporation and others.
+ * Copyright (c) 2021, 2025 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -91,7 +91,7 @@ public class ProgrammaticImageTest {
                     new ImageFromDockerfile().withDockerfileFromBuilder(builder -> builder.from(postgresql.asCanonicalNameString())//
                                     .copy("/docker-entrypoint-initdb.d/initDB.sql", "/docker-entrypoint-initdb.d/initDB.sql")
                                     .build())
-                                    .withFileFromFile("/docker-entrypoint-initdb.d/initDB.sql", new File("lib/LibertyFATTestFiles/postgres/scripts/initDB.sql"), 644))
+                                    .withFileFromFile("/docker-entrypoint-initdb.d/initDB.sql", new File("lib/LibertyFATTestFiles/postgres/initDB.sql"), 644))
                     .withExposedPorts(POSTGRE_PORT)
                     .withEnv("POSTGRES_DB", POSTGRES_DB)
                     .withEnv("POSTGRES_USER", POSTGRES_USER)

dev/build.example.testcontainers_fat/publish/files/postgres/initDB.sql

@@ -0,0 +1,12 @@
+DROP TABLE IF EXISTS testtable;
+
+-- Create table
+CREATE TABLE testtable (
+    PersonID int,
+    LastName varchar(255),
+    FirstName varchar(255),
+    City varchar(255) 
+);
+
+-- Insert test data
+INSERT INTO testtable (PersonID, LastName, FirstName, City) VALUES (1, 'Doe', 'John', 'Rochester');

dev/com.ibm.ws.install.featureUtility_fat/fat/src/com/ibm/ws/install/featureUtility/fat/InstallFeatureTest.java

@@ -53,6 +53,7 @@ public class InstallFeatureTest extends FeatureUtilityToolTest {
 	 * "Started Sonatype Nexus.*" to make sure repository is up and running.
 	 * Disabling due to intermittent time out
 	 */
+	// TODO publish Dockerfile for this custom image
 //	public static GenericContainer<?> nexusContainer = new GenericContainer<>("jiwoo/nexus:1.0")
 //		.withStartupTimeout(Duration.of(5, ChronoUnit.MINUTES))
 //        .waitingFor(Wait.forLogMessage("Started Sonatype Nexus.*", 1))
@@ -65,6 +66,7 @@ public class InstallFeatureTest extends FeatureUtilityToolTest {
 		.withLogConsumer(new SimpleLogConsumer(InstallFeatureTest.class, "keyserver")).withNetwork(network)
 		.withNetworkAliases("keyserver");
 
+	//TODO publish Dockerfile for this custom image
 	@ClassRule
 	public static GenericContainer<?> proxyContainer = new GenericContainer<>("jiwoo/squid-proxy:1.0")
 		.withExposedPorts(3128).withNetwork(network);

dev/com.ibm.ws.jdbc_fat_db2/fat/src/com/ibm/ws/jdbc/fat/db2/DB2Test.java

@@ -59,6 +59,15 @@ public static void setUp() throws Exception {
         server.addEnvVar("DB2_USER", db2.getUsername());
         server.addEnvVar("DB2_PASS", db2.getPassword());
 
+        // TODO extract security files from container prior to server start
+        // TODO delete security files from git
+
+        // Extract keystore from container
+//        db2.copyFileFromContainer("/certs/db2-keystore.p12", server.getServerRoot() + "/security/db2-keystore.p12");
+
+        // Extract server cert from container
+//        db2.copyFileFromContainer("/certs/server.arm", server.getServerRoot() + "/security/server.crt");
+
         server.startServer();
 
         runTest(server, APP_NAME + '/' + SERVLET_NAME, "initDatabase");