# HG changeset patch # User Jason Klinger # Date 1683653662 -3600 # Node ID abe2edacbcb527ef91424f11785e3a05b8d31930 # Parent d4d3cf9aef5e933f03d2e1c0affc7628ff7ed85b# Parent c3f58eddce4ff8c377c2df5977b8d4386782c7ab INV-475: Merging changes onto release branch. diff -r d4d3cf9aef5e -r abe2edacbcb5 prod/install-inventory-app.sh --- a/prod/install-inventory-app.sh Mon Oct 17 12:00:53 2022 -0400 +++ b/prod/install-inventory-app.sh Tue May 09 18:34:22 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 diff -r d4d3cf9aef5e -r abe2edacbcb5 prod/update-inventory-app.sh --- a/prod/update-inventory-app.sh Mon Oct 17 12:00:53 2022 -0400 +++ b/prod/update-inventory-app.sh Tue May 09 18:34:22 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