Skip to content

Commit

Permalink
BUG-859454 : Remove the unused code from entrypoint. (#214)
Browse files Browse the repository at this point in the history
* BUG-835878 - Remove unused code from docker entrypoint.

---------

Co-authored-by: kumas39 <saurabh.kumar2@in.pega.com>
  • Loading branch information
Saurabh-16 and kumas39 authored Jun 19, 2024
1 parent 1043660 commit 17b8fda
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 30 deletions.
7 changes: 0 additions & 7 deletions scripts/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,6 @@ else
export TOMCAT_KEYSTORE_PASSWORD=${TOMCAT_KEYSTORE_PASSWORD}
fi

if [ -e "$tomcat_keystore_file" ]; then
echo "TLS certificate for tomcat exists"
cat ${tomcat_keystore_file} | xargs printf '%b\n' | base64 --decode > "${tomcat_cert_root}/tlskeystore.jks"
export TOMCAT_KEYSTORE_DIR="${tomcat_cert_root}/tlskeystore.jks"
else
echo "TLS certificate does not exist"
fi
export TOMCAT_KEYSTORE_CONTENT=$tomcat_keystore_file

# Define the JDBC_URL variable based on inputs
Expand Down
23 changes: 0 additions & 23 deletions tests/pega-web-ready-testcases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1688,29 +1688,6 @@ commandTests:
exitCode: 0
expectedOutput: [ "TLS certificate password is - keystore_password_from_file" ]

# Tls certificate Directory as Environment variable
- name: "Tls certificate Directory as Environment variable"
envVars:
- key: "JDBC_URL"
value: "jdbc:postgresql://localhost:5432/pegadb"
- key: "JDBC_CLASS"
value: "org.postgresql.Driver"
- key: "DB_USERNAME"
value: "postgres"
- key: "DB_PASSWORD"
value: "postgres"
- key: "TOMCAT_KEYSTORE_CONTENT"
value: "pega_tls_cert_directory"
command: "bash"
args:
- -c
- |
mv /tests/test-artifacts/catalina.sh /usr/local/tomcat/bin/catalina.sh &&
mv tests/test-artifacts/TOMCAT_KEYSTORE_CONTENT /opt/pega/tomcatcertsmount/TOMCAT_KEYSTORE_CONTENT &&
bash -c '/scripts/docker-entrypoint.sh run'
exitCode: 0
expectedOutput: [ "TLS certificate directory is - /opt/pega/tomcatcerts/tlskeystore.jks" ]

# Dockerize server xml
- name: "Dockerize server.xml tmpl file"
envVars:
Expand Down

0 comments on commit 17b8fda

Please sign in to comment.