Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
// - /.github/workflows/azure-dev.yml
// - /.github/workflows/scheduled-azure-dev.yml
// - /.github/workflows/scheduled-azure-teardown.yml
"version": "1.10.1"
"version": "1.10.2"
},
"ghcr.io/devcontainers/features/docker-in-docker:2": {
"version": "latest"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/azure-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build:
runs-on: ubuntu-latest
container:
image: mcr.microsoft.com/azure-dev-cli-apps:1.10.1
image: mcr.microsoft.com/azure-dev-cli-apps:1.10.2
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-azure-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
build:
runs-on: ubuntu-latest
container:
image: mcr.microsoft.com/azure-dev-cli-apps:1.10.1
image: mcr.microsoft.com/azure-dev-cli-apps:1.10.2
env:
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-azure-teardown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
build:
runs-on: ubuntu-latest
container:
image: mcr.microsoft.com/azure-dev-cli-apps:1.10.1
image: mcr.microsoft.com/azure-dev-cli-apps:1.10.2
env:
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
Expand Down
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ Import-Module Az.Resources
Connect-AzAccount -UseDeviceAuthentication
```

If you have multiple tenants, you can use the following command instead to login to the correct tenant:

```pwsh
Connect-AzAccount -UseDeviceAuthentication -TenantId <tenant-id>
```

Set the subscription to the one you want to use (you can use [Get-AzSubscription](https://learn.microsoft.com/powershell/module/az.accounts/get-azsubscription?view=azps-11.3.0) to list available subscriptions):

```pwsh
Expand All @@ -126,6 +132,12 @@ Use the next command to login with the Azure Dev CLI (AZD) tool:
azd auth login --use-device-code
```

If you have multiple tenants, you can use the following command instead to log into the correct tenant:

```pwsh
azd auth login --use-device-code --tenant-id <tenant-id>
```

### 4. Create a new environment

Next we provide the AZD tool with variables that it uses to create the deployment. The first thing we initialize is the AZD environment with a name.
Expand Down
2 changes: 1 addition & 1 deletion infra/core/compute/postDeploymentScript/post-deployment.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# install AZD - keep this version in sync with the version used in the file /.devcontainer/devcontainer.json file
curl -fsSL https://aka.ms/install-azd.sh | bash -s -- -- version 1.10.1
curl -fsSL https://aka.ms/install-azd.sh | bash -s -- -- version 1.10.2

# add Microsoft package feed for the dotnet install
# Get Ubuntu version
Expand Down
29 changes: 29 additions & 0 deletions prod-deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ The following detailed deployment steps assume you are using a Dev Container ins
```pwsh
Connect-AzAccount -UseDeviceAuthentication
```
If you have multiple tenants, you can use the following command instead to login to the correct tenant:

```pwsh
Connect-AzAccount -UseDeviceAuthentication -TenantId <tenant-id>
```

1. Set the subscription to the one you want to use (you can use [Get-AzSubscription](https://learn.microsoft.com/powershell/module/az.accounts/get-azsubscription?view=azps-11.3.0) to list available subscriptions):

Expand All @@ -60,6 +65,11 @@ The following detailed deployment steps assume you are using a Dev Container ins
azd auth login --use-device-code
```

If you have multiple tenants, you can use the following command instead to log into the correct tenant:

```pwsh
azd auth login --use-device-code --tenant-id <tenant-id>
```

### 2. Provision the app

Expand Down Expand Up @@ -117,6 +127,12 @@ The following detailed deployment steps assume you are using a Dev Container ins
```pwsh
az login --use-device-code
```

If you have multiple tenants, you can use the following command instead to log into the correct tenant:

```pwsh
az login --use-device-code --tenant <tenant-id>
```

```pwsh
$AZURE_SUBSCRIPTION_ID = ((azd env get-values --output json | ConvertFrom-Json).AZURE_SUBSCRIPTION_ID)
Expand Down Expand Up @@ -207,6 +223,7 @@ The following detailed deployment steps assume you are using a Dev Container ins
exit # exit the ssh connection
ssh -F ./ssh-config 127.0.0.1 -p 50022
pwsh
cd web-app-pattern
```

1. [Sign in to Azure PowerShell interactively](https://learn.microsoft.com/powershell/azure/authenticate-interactive):
Expand All @@ -215,6 +232,12 @@ The following detailed deployment steps assume you are using a Dev Container ins
Connect-AzAccount -UseDeviceAuthentication
```

If you have multiple tenants, you can use the following command instead to login to the correct tenant:

```pwsh
Connect-AzAccount -UseDeviceAuthentication -TenantId <tenant-id>
```

```pwsh
Set-AzContext -SubscriptionId ((azd env get-values --output json | ConvertFrom-Json).AZURE_SUBSCRIPTION_ID)
```
Expand All @@ -225,6 +248,12 @@ The following detailed deployment steps assume you are using a Dev Container ins
azd auth login --use-device-code
```

If you have multiple tenants, you can use the following command instead to log into the correct tenant:

```pwsh
azd auth login --use-device-code --tenant-id <tenant-id>
```

1. Deploy the application to the primary region using:

<!-- from PowerShell use the following command to deploy the code to the secondary region:
Expand Down
2 changes: 1 addition & 1 deletion src/Relecloud.Messaging/Relecloud.Messaging.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.10.4" />
<PackageReference Include="Azure.Identity" Version="1.11.4" />
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.17.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
Expand Down
Loading