From 200d9f0d04fa27d3eb74ac65e34f0a909f136066 Mon Sep 17 00:00:00 2001 From: mchyzer Date: Tue, 27 Feb 2024 12:25:02 -0500 Subject: [PATCH] 4.11.0 --- .../containerDockerfileInstall.sh | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/container_files/docker-build-bin/containerDockerfileInstall.sh b/container_files/docker-build-bin/containerDockerfileInstall.sh index 3ab7780..db0b5e6 100644 --- a/container_files/docker-build-bin/containerDockerfileInstall.sh +++ b/container_files/docker-build-bin/containerDockerfileInstall.sh @@ -165,19 +165,24 @@ returnCode=$? echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/grouper/certs/anchors, result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi -mkdir -p /opt/grouper/certs/keys -returnCode=$? -echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/grouper/certs/keys, result: $returnCode" -if [ $returnCode != 0 ]; then exit $returnCode; fi +#mv /opt/container_files/certs/* /opt/grouper/certs/ +#returnCode=$? +#echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/container_files/certs/* /opt/grouper/certs/, result: $returnCode" +#if [ $returnCode != 0 ]; then exit $returnCode; fi -cp -R /opt/container_files/certs/* /opt/grouper/certs/ +chmod u+w $JAVA_HOME/lib/security/cacerts returnCode=$? -echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp -R /opt/container_files/certs/* /opt/grouper/certs/, result: $returnCode" -if [ $returnCode != 0 ]; then exit $returnCode; fi - -rm -rf /opt/container_files/certs +echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) chmod u+w $JAVA_HOME/lib/security/cacerts , result=$returnCode" +if [ $returnCode != 0 ]; then exit $returnCode; fi + +/usr/lib/jvm/java/bin/keytool -import -noprompt -cacerts -storepass changeit -alias "localhost" -file "/opt/container_files/certs/localhost.pem" +returnCode=$? +echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) /usr/lib/jvm/java/bin/keytool -import -noprompt -cacerts -storepass changeit -alias \"localhost\" -file \"/opt/container_files/certs/localhost.pem\" , result=$returnCode" +if [ $returnCode != 0 ]; then exit $returnCode; fi + +chmod u-w $JAVA_HOME/lib/security/cacerts returnCode=$? -echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -rf /opt/container_files/certs, result: $returnCode" +echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) chmod u-w $JAVA_HOME/lib/security/cacerts , result=$returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi echo 'umask 002' >> /home/tomcat/.bashrc