Mercurial > public > ssdt-docker
changeset 418:abe2edacbcb5 release/2.16.0
INV-475: Merging changes onto release branch.
| author | Jason Klinger <klinger@nwoca.org> |
|---|---|
| date | Tue, 09 May 2023 18:34:22 +0100 |
| parents | d4d3cf9aef5e (current diff) c3f58eddce4f (diff) |
| children | a524a67503dc |
| files | |
| diffstat | 2 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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