Mercurial > public > ssdt-docker

changeset 421:5b027b3e5c8e production 2.16.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
flow: Merged <release> '2.16.0' to <master> ('production').
author Jason Klinger <klinger@nwoca.org>
date Tue, 09 May 2023 18:34:52 +0100
parents ff70a9d9571c (current diff) a524a67503dc (diff)
children e668fc4ac67c
files
diffstat 4 files changed, 30 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/prod/install-inventory-app.sh	Fri Oct 14 10:20:38 2022 -0400
+++ b/prod/install-inventory-app.sh	Tue May 09 18:34:52 2023 +0100
@@ -41,6 +41,11 @@
     dockerRunCommand="$dockerRunCommand -p $hostPort"
 fi
 #
+if [ ! -z "$duo_enabled" ]; then
+    dockerRunCommand="$dockerRunCommand -e DUO_ENABLED=$duo_enabled -e DUO_CLIENT_ID=$duo_client_id -e DUO_CLIENT_SECRET=$duo_client_secret -e DUO_API_HOSTNAME=$duo_api_hostname -e DUO_FAIL_OPEN=$duo_fail_open "
+    dockerRunCommand="$dockerRunCommand -e DUO_USXS_HOST=$duo_usxs_host -e DUO_USXS_PORT=$duo_usxs_port -e DUO_USXS_CONTEXT=$duo_usxs_context -e DUO_MINUTES_UNTIL_EXPIRATION=$duo_minutes_until_expiration "
+fi
+#
 dockerRunCommand="$dockerRunCommand -d $artifactUrl/inventory-app:$appVersion"
 #
 # Execute constructed docker run command to create $entityId-inventory-app container connected to db and docker network
--- a/prod/install-itcm-app.sh	Fri Oct 14 10:20:38 2022 -0400
+++ b/prod/install-itcm-app.sh	Tue May 09 18:34:52 2023 +0100
@@ -49,15 +49,15 @@
 if [ ! -z "$duoEnabled" ]; then
     echo "Adding Duo Configuration"
     dockerRunCommand="$dockerRunCommand 
-        -e SSDT_DUO_ENABLED=$duoEnabled 
-        -e SSDT_DUO_CLIENT_ID=$duoClientId 
-        -e SSDT_DUO_CLIENT_SECRET=$duoClientSecret 
-        -e SSDT_DUO_API_HOSTNAME=$duoApiHostname 
-        -e SSDT_DUO_FAIL_OPEN=$duoFailOpen 
-        -e SSDT_DUO_ITCM_HOST=$duoItcmHost 
-        -e SSDT_DUO_ITCM_PORT=$duoItcmPort 
-        -e SSDT_DUO_ITCM_CONTEXT=$duoItcmContext 
-        -e SSDT_DUO_MINUTES_UNTIL_EXPIRATION=$duoMinutesUntilExpiration"
+        -e DUO_ENABLED=$duoEnabled
+        -e DUO_CLIENT_ID=$duoClientId
+        -e DUO_CLIENT_SECRET=$duoClientSecret
+        -e DUO_API_HOSTNAME=$duoApiHostname
+        -e DUO_FAIL_OPEN=$duoFailOpen
+        -e DUO_ITCM_HOST=$duoItcmHost
+        -e DUO_ITCM_PORT=$duoItcmPort
+        -e DUO_ITCM_CONTEXT=$duoItcmContext
+        -e DUO_MINUTES_UNTIL_EXPIRATION=$duoMinutesUntilExpiration"
 fi
 #
 #
@@ -98,4 +98,4 @@
 #
 # Execute constructed docker run command to create $entityId-itcm-app container connected to db and docker network
 echo "Executing docker run command"
-$dockerRunCommand
\ No newline at end of file
+$dockerRunCommand
--- a/prod/update-inventory-app.sh	Fri Oct 14 10:20:38 2022 -0400
+++ b/prod/update-inventory-app.sh	Tue May 09 18:34:52 2023 +0100
@@ -51,6 +51,11 @@
     dockerRunCommand="$dockerRunCommand -p $hostPort"
 fi
 #
+if [ ! -z "$duo_enabled" ]; then
+    dockerRunCommand="$dockerRunCommand -e DUO_ENABLED=$duo_enabled -e DUO_CLIENT_ID=$duo_client_id -e DUO_CLIENT_SECRET=$duo_client_secret -e DUO_API_HOSTNAME=$duo_api_hostname -e DUO_FAIL_OPEN=$duo_fail_open "
+    dockerRunCommand="$dockerRunCommand -e DUO_USXS_HOST=$duo_usxs_host -e DUO_USXS_PORT=$duo_usxs_port -e DUO_USXS_CONTEXT=$duo_usxs_context -e DUO_MINUTES_UNTIL_EXPIRATION=$duo_minutes_until_expiration "
+fi
+#
 dockerRunCommand="$dockerRunCommand -d $artifactUrl/inventory-app:$appVersion"
 #
 # Execute constructed docker run command to create $entityId-inventory-app container connected to db and docker network
--- a/prod/update-itcm-app.sh	Fri Oct 14 10:20:38 2022 -0400
+++ b/prod/update-itcm-app.sh	Tue May 09 18:34:52 2023 +0100
@@ -59,15 +59,15 @@
 if [ ! -z "$duoEnabled" ]; then
     echo "Adding Duo Configuration"
     dockerRunCommand="$dockerRunCommand 
-        -e SSDT_DUO_ENABLED=$duoEnabled 
-        -e SSDT_DUO_CLIENT_ID=$duoClientId 
-        -e SSDT_DUO_CLIENT_SECRET=$duoClientSecret 
-        -e SSDT_DUO_API_HOSTNAME=$duoApiHostname 
-        -e SSDT_DUO_FAIL_OPEN=$duoFailOpen 
-        -e SSDT_DUO_ITCM_HOST=$duoItcmHost 
-        -e SSDT_DUO_ITCM_PORT=$duoItcmPort 
-        -e SSDT_DUO_ITCM_CONTEXT=$duoItcmContext 
-        -e SSDT_DUO_MINUTES_UNTIL_EXPIRATION=$duoMinutesUntilExpiration"
+        -e DUO_ENABLED=$duoEnabled
+        -e DUO_CLIENT_ID=$duoClientId
+        -e DUO_CLIENT_SECRET=$duoClientSecret
+        -e DUO_API_HOSTNAME=$duoApiHostname
+        -e DUO_FAIL_OPEN=$duoFailOpen
+        -e DUO_ITCM_HOST=$duoItcmHost
+        -e DUO_ITCM_PORT=$duoItcmPort
+        -e DUO_ITCM_CONTEXT=$duoItcmContext
+        -e DUO_MINUTES_UNTIL_EXPIRATION=$duoMinutesUntilExpiration"
 fi
 #
 #
@@ -108,4 +108,4 @@
 #
 # Execute constructed docker run command to create $entityId-itcm-app container connected to db and docker network
 echo "Executing docker run command"
-$dockerRunCommand
\ No newline at end of file
+$dockerRunCommand