Merge branch 'master' into 3.4.1_03082024_rocky8_multiarch

docker · Mar 8, 2024 · 8ee61bc · 8ee61bc
2 parents a0b202b + fd22425
commit 8ee61bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -36,6 +36,7 @@ ADD ./container_files/shibboleth/* /etc/shibboleth/
 
 RUN openssl req -new -nodes -newkey rsa:2048 -subj "/commonName=localhost.localdomain" -batch -keyout /etc/pki/tls/private/localhost.key -out localhost.csr
 RUN openssl x509 -req -days 1825 -in localhost.csr -signkey /etc/pki/tls/private/localhost.key -out /etc/pki/tls/certs/localhost.crt
+
 RUN sed -i '/^[[:space:]]*CustomLog/s/^/#/' /etc/httpd/conf/httpd.conf
 
 # add a basic page to shibb's default protected directory

diff --git a/container_files/system/startup.sh b/container_files/system/startup.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 #for passed-in env vars, remove spaces and replace any ; with : in usertoken env var since we will use ; as a delimiter
+echo -e "Usertoken: ${USERTOKEN}"
+echo -e "Environment: ${ENV}"
 export USERTOKEN="${USERTOKEN//;/:}"
 export USERTOKEN="${USERTOKEN// /}"
 export ENV="${ENV//;/:}"