From 1059c45a4f6f2ccedd5343f9c4cc7712e9a940c0 Mon Sep 17 00:00:00 2001 From: Gary Clayburg Date: Tue, 24 Oct 2023 12:39:46 -0600 Subject: [PATCH] move pkcs12 testing cert to memuser production classpath This gets around the issue of needing to do volume mounts in docker-compose.yml to mount the jenkins workspace doing the build into the running container when the jenkins build itself is running in a container. Even though this pkcs12 file is only needed for testing, it doesn't really hurt anything to stuff it in the classpath --- e2etesting/docker-compose.yml | 2 +- .../insecuretlswrapperwithgibberishhostname.p12 | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename {e2etesting/src/test => src/main}/resources/insecuretlswrapperwithgibberishhostname.p12 (100%) diff --git a/e2etesting/docker-compose.yml b/e2etesting/docker-compose.yml index 4e8d0c1..059f34f 100644 --- a/e2etesting/docker-compose.yml +++ b/e2etesting/docker-compose.yml @@ -9,7 +9,7 @@ services: command: > --security.require-ssl=true --server.port=443 - --server.ssl.key-store=/tlskey/insecuretlswrapperwithgibberishhostname.p12 + --server.ssl.key-store=classpath:insecuretlswrapperwithgibberishhostname.p12 --server.ssl.key-store-password=changeit --server.ssl.key-store-type=PKCS12 --server.ssl.key-alias=gibberishhostname diff --git a/e2etesting/src/test/resources/insecuretlswrapperwithgibberishhostname.p12 b/src/main/resources/insecuretlswrapperwithgibberishhostname.p12 similarity index 100% rename from e2etesting/src/test/resources/insecuretlswrapperwithgibberishhostname.p12 rename to src/main/resources/insecuretlswrapperwithgibberishhostname.p12