Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reintroduce #30589 move custom dockerfiles to a central locatio #30597

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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');

This file was deleted.

This file was deleted.

30 changes: 0 additions & 30 deletions dev/com.ibm.ws.cloudant_fat/publish/files/couchdb-ssl/release.sh

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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);
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
76 changes: 0 additions & 76 deletions dev/com.ibm.ws.jdbc_fat_db2/publish/files/db2-ssl/release.sh

This file was deleted.

31 changes: 0 additions & 31 deletions dev/com.ibm.ws.jdbc_fat_krb5/publish/files/db2/release.sh

This file was deleted.

This file was deleted.

31 changes: 0 additions & 31 deletions dev/com.ibm.ws.jdbc_fat_krb5/publish/files/kdc-server/release.sh

This file was deleted.

31 changes: 0 additions & 31 deletions dev/com.ibm.ws.jdbc_fat_krb5/publish/files/oracle/release.sh

This file was deleted.

Loading