Skip to content

Commit

Permalink
Fix dev container CLI install path and shared services install jq com…
Browse files Browse the repository at this point in the history
…mand (#2725)

* Fix CLI install path and shared services jq

* allow update of deleted or deploymentFailed

* Update changelog and add _
  • Loading branch information
marrobi authored Oct 12, 2022
1 parent 7c82717 commit a533667
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/scripts/post-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ set -e
sudo bash ./devops/scripts/set_docker_sock_permission.sh

# install tre CLI
(cd /workspaces/AzureTRE/cli/ && make install-cli) && echo -e "\n# Set up tre completion\nsource <(_TRE_COMPLETE=bash_source tre)" >> ~/.bashrc
(cd ./cli/ && make install-cli) && echo -e "\n# Set up tre completion\nsource <(_TRE_COMPLETE=bash_source tre)" >> ~/.bashrc

14 changes: 1 addition & 13 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,9 @@

## 0.5.1 (Unreleased)

**BREAKING CHANGES & MIGRATIONS**:

*

FEATURES:

*

ENHANCEMENTS:

*

BUG FIXES:

*
* Fix shared service 409 installation issue when in status other than deployed ([#2725](https://github.com/microsoft/AzureTRE/pull/2725))



Expand Down
2 changes: 1 addition & 1 deletion devops/scripts/deploy_shared_service.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if [[ "$last_result" != 0 ]]; then
fi

deployed_shared_service=$(echo "${get_shared_services_result}" \
| jq -r ".sharedServices[] | select(.templateName == \"${template_name}\" and .deploymentStatus == \"deployed\")")
| jq -r ".sharedServices[] | select(.templateName == \"${template_name}\" and (.deploymentStatus != \"deleted\" or .deploymentStatus != \"deployment_failed\"))")

if [[ -n "${deployed_shared_service}" ]]; then
# Get template version of the service already deployed
Expand Down

0 comments on commit a533667

Please sign in to comment.