From 213fd2c9cd6ebc0a1dba0eb1d5e7fba7da9e0a14 Mon Sep 17 00:00:00 2001 From: Will Smith Date: Tue, 17 Oct 2023 03:47:18 +0100 Subject: [PATCH] Migrate to GHCR (#615) * Migrate to GHCR --- .github/workflows/build.yaml | 65 +------------------ .../workflows/purge-azure-test-resources.yaml | 2 +- .github/workflows/test.yaml | 15 ++--- samples/aws-sqs/sqs.bicep | 4 +- samples/aws/awss3.bicep | 2 +- samples/dapr/dapr-azure.bicep | 4 +- samples/dapr/dapr.bicep | 4 +- samples/demo/app.bicep | 2 +- samples/eshop-dapr/services/basket-api.bicep | 2 +- .../eshop-dapr/services/blazor-client.bicep | 2 +- samples/eshop-dapr/services/catalog-api.bicep | 2 +- .../eshop-dapr/services/identity-api.bicep | 2 +- .../eshop-dapr/services/ordering-api.bicep | 2 +- samples/eshop-dapr/services/payment-api.bicep | 2 +- .../eshop-dapr/services/webshopping-agg.bicep | 2 +- .../eshop-dapr/services/webshopping-gw.bicep | 2 +- samples/eshop-dapr/services/webstatus.bicep | 2 +- samples/eshop/envoy/README.md | 4 +- samples/eshop/iac/eshop.bicep | 4 +- samples/eshop/iac/services/basket.bicep | 4 +- samples/eshop/iac/services/catalog.bicep | 4 +- samples/eshop/iac/services/identity.bicep | 4 +- samples/eshop/iac/services/ordering.bicep | 8 +-- samples/eshop/iac/services/payment.bicep | 4 +- samples/eshop/iac/services/web.bicep | 6 +- samples/eshop/iac/services/webhooks.bicep | 6 +- samples/eshop/iac/services/webshopping.bicep | 6 +- samples/eshop/iac/services/webstatus.bicep | 4 +- samples/volumes/app.bicep | 2 +- 29 files changed, 51 insertions(+), 121 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4c92733f..272810c1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,51 +18,12 @@ concurrency: env: VERSION: ${{ github.event.pull_request.number || 'latest' }} - # Use radiusdev.azurecr.io for PR build. Otherwise, use radius.azurecr.io. - # TODO_LAUNCH: Remove this env var once we opensource the repo - https://github.com/radius-project/samples/issues/439 - DOCKER_REGISTRY: ${{ github.event.pull_request.number && 'radiusdev.azurecr.io' || 'radius.azurecr.io' }} - # Use radiusdev.azurecr.io for PR build. Otherwise, use radius.azurecr.io. + # Use ghcr.io/radius-project/dev for PR build. Otherwise, use ghcr.io/radius-project. CONTAINER_REGISTRY: ${{ github.event.pull_request.number && 'ghcr.io/radius-project/dev' || 'ghcr.io/radius-project' }} # Set to true to push images to registry. PUSH_IMAGE: true jobs: - # TODO_LAUNCH: Remove this build job once we opensource the repo - https://github.com/radius-project/samples/issues/439 - build-acr: - name: Build and push sample images to ACR - if: github.event.action != 'closed' - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - include: - - directory: samples/demo/ - image: samples/demo - - directory: samples/dapr/ui/ - image: samples/dapr-frontend - - directory: samples/dapr/nodeapp/ - image: samples/dapr-backend - - directory: samples/aws/ - image: samples/aws - - directory: samples/aws-sqs/ - image: samples/aws-sqs - - directory: samples/volumes/ - image: samples/volumes - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: Login to container registry - uses: azure/docker-login@v1 - with: - login-server: ${{ env.DOCKER_REGISTRY }} - username: '${{ secrets.AZURE_SP_DOCKER_USERNAME }}' - password: '${{ secrets.AZURE_SP_DOCKER_PASSWORD }}' - - name: Build and push ${{ matrix.image }} - uses: docker/build-push-action@v4 - with: - context: ./${{ matrix.directory }} - push: ${{ env.PUSH_IMAGE }} - tags: ${{ env.DOCKER_REGISTRY }}/${{ matrix.image }}:${{ env.VERSION }} build-ghcr: name: Build and push sample images to GHCR if: github.event.action != 'closed' @@ -101,27 +62,3 @@ jobs: context: ./${{ matrix.directory }} push: ${{ env.PUSH_IMAGE }} tags: ${{ env.CONTAINER_REGISTRY }}/${{ matrix.image }}:${{ env.VERSION }} - - # TODO_LAUNCH: Remove this job once we opensource the repo because all pkgs will be cleaned up regularly - https://github.com/radius-project/samples/issues/439 - cleanup: - name: Cleanup ${{ matrix.image }} - if: github.event.action == 'closed' - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - image: [ - samples/demo, - samples/dapr-frontend, - samples/dapr-backend, - samples/aws, - samples/aws-sqs, - samples/volumes - ] - steps: - - name: Login to az cli and ACR - run: | - az login --service-principal --username ${{ secrets.AZURE_SP_DOCKER_USERNAME }} --password ${{ secrets.AZURE_SP_DOCKER_PASSWORD }} --tenant ${{ secrets.AZURE_SP_DOCKER_TENANT }} - az acr login --name ${{ env.DOCKER_REGISTRY }} - - name: Delete PR images - run: az acr repository delete --name ${{ env.DOCKER_REGISTRY }} --image "${{ matrix.image }}:${{ env.VERSION }}" --yes diff --git a/.github/workflows/purge-azure-test-resources.yaml b/.github/workflows/purge-azure-test-resources.yaml index 91bc0bd3..05195f98 100644 --- a/.github/workflows/purge-azure-test-resources.yaml +++ b/.github/workflows/purge-azure-test-resources.yaml @@ -8,7 +8,7 @@ env: jobs: purge_azure_resources: name: Azure test resource cleanup - runs-on: [self-hosted, 1ES.Pool=1ES-Radius] + runs-on: [ubuntu-latest] steps: - name: Login to Azure run: | diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 696903dd..ac84ef97 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -28,7 +28,7 @@ env: jobs: test: name: Sample tests - runs-on: [self-hosted, 1ES.Pool=1ES-Radius-Samples] + runs-on: [ubuntu-latest] strategy: fail-fast: false matrix: @@ -179,13 +179,6 @@ jobs: run: | helm repo add dapr https://dapr.github.io/helm-charts/ helm install dapr dapr/dapr --version=1.6 --namespace dapr-system --create-namespace --wait - # TODO: Remove authentication once GHCR is public - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: rad-ci-bot - password: ${{ secrets.GH_RAD_CI_BOT_PAT }} - name: Download rad CLI if: steps.gen-id.outputs.RUN_TEST == 'true' run: | @@ -219,8 +212,8 @@ jobs: rad group switch default rad env create default rad env switch default - rad recipe register default -e default -w default --template-kind bicep --template-path radius.azurecr.io/recipes/dev/rediscaches:latest --resource-type Applications.Datastores/redisCaches - rad recipe register default -e default -w default --template-kind bicep --template-path radius.azurecr.io/recipes/dev/mongodatabases:latest --resource-type Applications.Datastores/mongoDatabases + rad recipe register default -e default -w default --template-kind bicep --template-path ghcr.io/radius-project/recipes/local-dev/rediscaches:latest --resource-type Applications.Datastores/redisCaches + rad recipe register default -e default -w default --template-kind bicep --template-path ghcr.io/radius-project/recipes/local-dev/mongodatabases:latest --resource-type Applications.Datastores/mongoDatabases if [[ "${{ matrix.credential }}" == "azure" ]]; then rad env update default --azure-subscription-id ${{ secrets.AZURE_SUBSCRIPTIONID_TESTS }} --azure-resource-group ${{ steps.gen-id.outputs.TEST_AZURE_RESOURCE_GROUP }} rad credential register azure --client-id ${{ secrets.AZURE_SP_TESTS_APPID }} --client-secret ${{ secrets.AZURE_SP_TESTS_PASSWORD }} --tenant-id ${{ secrets.AZURE_SP_TESTS_TENANTID }} @@ -271,7 +264,7 @@ jobs: mkdir -p playwright/pod-logs/${{ matrix.name }} # Get pod logs and save to file namespace="default-${{ matrix.app }}" - label="radius.dev/application=${{ matrix.app }}" + label="radapp.io/application=${{ matrix.app }}" pod_names=($(kubectl get pods -l $label -n $namespace -o jsonpath='{.items[*].metadata.name}')) for pod_name in "${pod_names[@]}"; do kubectl logs $pod_name -n $namespace > playwright/pod-logs/${{ matrix.name }}/${pod_name}.txt diff --git a/samples/aws-sqs/sqs.bicep b/samples/aws-sqs/sqs.bicep index f588fd3b..5902a0a6 100644 --- a/samples/aws-sqs/sqs.bicep +++ b/samples/aws-sqs/sqs.bicep @@ -44,7 +44,7 @@ resource producer 'Applications.Core/containers@2023-10-01-preview' = { }, aws_credential ) - image: 'radius.azurecr.io/reference-apps/aws-sqs-sample:edge' + image: 'ghcr.io/radius-project/samples/aws-sqs-sample:latest' } } } @@ -61,7 +61,7 @@ resource consumer 'Applications.Core/containers@2023-10-01-preview' = { }, aws_credential ) - image: 'radius.azurecr.io/reference-apps/aws-sqs-sample:edge' + image: 'ghcr.io/radius-project/samples/aws-sqs-sample:latest' } } } diff --git a/samples/aws/awss3.bicep b/samples/aws/awss3.bicep index 6b2d8195..7e84671d 100644 --- a/samples/aws/awss3.bicep +++ b/samples/aws/awss3.bicep @@ -39,7 +39,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = { AWS_SECRET_ACCESS_KEY: aws_secret_access_key AWS_DEFAULT_REGION: aws_region } - image: 'radius.azurecr.io/reference-apps/aws:edge' + image: 'ghcr.io/radius-project/samples/aws:latest' } } } diff --git a/samples/dapr/dapr-azure.bicep b/samples/dapr/dapr-azure.bicep index 8ab82e8a..8bc92681 100644 --- a/samples/dapr/dapr-azure.bicep +++ b/samples/dapr/dapr-azure.bicep @@ -15,7 +15,7 @@ resource backend 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: app.id container: { - image: 'radius.azurecr.io/quickstarts/dapr-backend:edge' + image: 'ghcr.io/radius-project/samples/dapr-backend:latest' ports: { web: { containerPort: 3000 @@ -42,7 +42,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: app.id container: { - image: 'radius.azurecr.io/quickstarts/dapr-frontend:edge' + image: 'ghcr.io/radius-project/samples/dapr-frontend:latest' env: { CONNECTION_BACKEND_APPID: backend.name } diff --git a/samples/dapr/dapr.bicep b/samples/dapr/dapr.bicep index c083001c..85f9bcd3 100644 --- a/samples/dapr/dapr.bicep +++ b/samples/dapr/dapr.bicep @@ -18,7 +18,7 @@ resource backend 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: app.id container: { - image: 'radius.azurecr.io/quickstarts/dapr-backend:edge' + image: 'ghcr.io/radius-project/samples/dapr-backend:latest' ports: { web: { containerPort: 3000 @@ -45,7 +45,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: app.id container: { - image: 'radius.azurecr.io/quickstarts/dapr-frontend:edge' + image: 'ghcr.io/radius-project/samples/dapr-frontend:latest' env: { CONNECTION_BACKEND_APPID: backend.name } diff --git a/samples/demo/app.bicep b/samples/demo/app.bicep index 6533225f..9ef4a41c 100644 --- a/samples/demo/app.bicep +++ b/samples/demo/app.bicep @@ -8,7 +8,7 @@ resource demo 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/tutorial/webapp:edge' + image: 'ghcr.io/radius-project/samples/demo:latest' ports: { web: { containerPort: 3000 diff --git a/samples/eshop-dapr/services/basket-api.bicep b/samples/eshop-dapr/services/basket-api.bicep index a5f61908..1ea2ac60 100644 --- a/samples/eshop-dapr/services/basket-api.bicep +++ b/samples/eshop-dapr/services/basket-api.bicep @@ -61,7 +61,7 @@ resource basketApi 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: appId container: { - image: 'radius.azurecr.io/eshopdapr/basket.api:rad-latest' + image: 'ghcr.io/radius-project/samples/eshopdapr/basket.api:rad-latest' env: { ASPNETCORE_ENVIRONMENT: 'Development' ASPNETCORE_URLS: 'http://0.0.0.0:80' diff --git a/samples/eshop-dapr/services/blazor-client.bicep b/samples/eshop-dapr/services/blazor-client.bicep index d159db6c..5960b868 100644 --- a/samples/eshop-dapr/services/blazor-client.bicep +++ b/samples/eshop-dapr/services/blazor-client.bicep @@ -37,7 +37,7 @@ resource blazorClient 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: appId container: { - image: 'radius.azurecr.io/eshopdapr/blazor.client:rad-latest' + image: 'ghcr.io/radius-project/samples/eshopdapr/blazor.client:rad-latest' env: { ASPNETCORE_ENVIRONMENT: 'Development' ASPNETCORE_URLS: 'http://0.0.0.0:80' diff --git a/samples/eshop-dapr/services/catalog-api.bicep b/samples/eshop-dapr/services/catalog-api.bicep index eb7e0a73..3eb1af01 100644 --- a/samples/eshop-dapr/services/catalog-api.bicep +++ b/samples/eshop-dapr/services/catalog-api.bicep @@ -62,7 +62,7 @@ resource catalogApi 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: appId container: { - image: 'radius.azurecr.io/eshopdapr/catalog.api:rad-latest' + image: 'ghcr.io/radius-project/samples/eshopdapr/catalog.api:rad-latest' env: { ASPNETCORE_ENVIRONMENT: 'Development' ASPNETCORE_URLS: 'http://0.0.0.0:80' diff --git a/samples/eshop-dapr/services/identity-api.bicep b/samples/eshop-dapr/services/identity-api.bicep index 294f00d0..8e67da7c 100644 --- a/samples/eshop-dapr/services/identity-api.bicep +++ b/samples/eshop-dapr/services/identity-api.bicep @@ -61,7 +61,7 @@ resource identityApi 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: appId container: { - image: 'radius.azurecr.io/eshopdapr/identity.api:rad-latest' + image: 'ghcr.io/radius-project/samples/eshopdapr/identity.api:rad-latest' env: { ASPNETCORE_ENVIRONMENT: 'Development' ASPNETCORE_URLS: 'http://0.0.0.0:80' diff --git a/samples/eshop-dapr/services/ordering-api.bicep b/samples/eshop-dapr/services/ordering-api.bicep index 219bc77e..c4ca3526 100644 --- a/samples/eshop-dapr/services/ordering-api.bicep +++ b/samples/eshop-dapr/services/ordering-api.bicep @@ -76,7 +76,7 @@ resource orderingApi 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: appId container: { - image: 'radius.azurecr.io/eshopdapr/ordering.api:rad-latest' + image: 'ghcr.io/radius-project/samples/eshopdapr/ordering.api:rad-latest' env: { ASPNETCORE_ENVIRONMENT: 'Development' ASPNETCORE_URLS: 'http://0.0.0.0:80' diff --git a/samples/eshop-dapr/services/payment-api.bicep b/samples/eshop-dapr/services/payment-api.bicep index 3d1b4c8b..b7cf58fc 100644 --- a/samples/eshop-dapr/services/payment-api.bicep +++ b/samples/eshop-dapr/services/payment-api.bicep @@ -40,7 +40,7 @@ resource paymentApi 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: appId container: { - image: 'radius.azurecr.io/eshopdapr/payment.api:rad-latest' + image: 'ghcr.io/radius-project/samples/eshopdapr/payment.api:rad-latest' env: { ASPNETCORE_ENVIRONMENT: 'Development' ASPNETCORE_URLS: 'http://0.0.0.0:80' diff --git a/samples/eshop-dapr/services/webshopping-agg.bicep b/samples/eshop-dapr/services/webshopping-agg.bicep index 25369d3f..8481bf9c 100644 --- a/samples/eshop-dapr/services/webshopping-agg.bicep +++ b/samples/eshop-dapr/services/webshopping-agg.bicep @@ -46,7 +46,7 @@ resource webshoppingAgg 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: appId container: { - image: 'radius.azurecr.io/eshopdapr/webshoppingagg:rad-latest' + image: 'ghcr.io/radius-project/samples/eshopdapr/webshoppingagg:rad-latest' env: { ASPNETCORE_ENVIRONMENT: 'Development' ASPNETCORE_URLS: 'http://0.0.0.0:80' diff --git a/samples/eshop-dapr/services/webshopping-gw.bicep b/samples/eshop-dapr/services/webshopping-gw.bicep index f98a6061..242e508c 100644 --- a/samples/eshop-dapr/services/webshopping-gw.bicep +++ b/samples/eshop-dapr/services/webshopping-gw.bicep @@ -25,7 +25,7 @@ resource webshoppingGw 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: appId container: { - image: 'radius.azurecr.io/eshopdapr/webshoppingapigw:rad-latest' + image: 'ghcr.io/radius-project/samples/eshopdapr/webshoppingapigw:rad-latest' env: { ENVOY_CATALOG_API_ADDRESS: catalogApiRoute.properties.hostname ENVOY_CATALOG_API_PORT: '${catalogApiRoute.properties.port}' diff --git a/samples/eshop-dapr/services/webstatus.bicep b/samples/eshop-dapr/services/webstatus.bicep index 77600d51..e86204fa 100644 --- a/samples/eshop-dapr/services/webstatus.bicep +++ b/samples/eshop-dapr/services/webstatus.bicep @@ -33,7 +33,7 @@ resource webstatus 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: appId container: { - image: 'radius.azurecr.io/eshopdapr/webstatus:rad-latest' + image: 'ghcr.io/radius-project/samples/eshopdapr/webstatus:rad-latest' env: { ASPNETCORE_ENVIRONMENT: 'Development' ASPNETCORE_URLS: 'http://0.0.0.0:80' diff --git a/samples/eshop/envoy/README.md b/samples/eshop/envoy/README.md index b542a623..7e78fdaf 100644 --- a/samples/eshop/envoy/README.md +++ b/samples/eshop/envoy/README.md @@ -6,9 +6,9 @@ What this means is that if we need to update the names of routes in eshop, *we l The routing configuration is in [envoy.yaml](envoy.yaml). See the `route_config` section specifically. -To build the docker image, run `docker build . -t radius.azurecr.io/eshop-envoy:0.1.`. +To build the docker image, run `docker build . -t ghcr.io/radius-project/samples/eshop-envoy:0.1.`. Where NUMBER is one greater than the latest version made. To view versions, see https://ms.portal.azure.com/#view/Microsoft_Azure_ContainerRegistries/RepositoryBlade/id/%2Fsubscriptions%2F66d1209e-1382-45d3-99bb-650e6bf63fc0%2FresourceGroups%2Fassets%2Fproviders%2FMicrosoft.ContainerRegistry%2Fregistries%2Fradius/repository/eshop-envoy. -To push the image, run `az acr login -n radius` and then `docker push radius.azurecr.io/eshop-envoy:0.1.`. +To push the image, run `az acr login -n radius` and then `docker push ghcr.io/radius-project/samples/eshop-envoy:0.1.`. diff --git a/samples/eshop/iac/eshop.bicep b/samples/eshop/iac/eshop.bicep index 2f6b0308..2c7444f4 100644 --- a/samples/eshop/iac/eshop.bicep +++ b/samples/eshop/iac/eshop.bicep @@ -48,8 +48,8 @@ var AZURESERVICEBUSENABLED = (platform == 'azure') ? 'True' : 'False' ]) param ENABLEDEVSPACES string = 'False' -@description('Cotnainer image tag to use for eshop images. Defaults to linux-dotnet7') -param TAG string = 'linux-dotnet7' +@description('Container image tag to use for eshop images') +param TAG string = 'latest' @description('Name of your EKS cluster. Only used if deploying with AWS infrastructure.') param eksClusterName string = '' diff --git a/samples/eshop/iac/services/basket.bicep b/samples/eshop/iac/services/basket.bicep index d4023022..9458be8f 100644 --- a/samples/eshop/iac/services/basket.bicep +++ b/samples/eshop/iac/services/basket.bicep @@ -5,7 +5,7 @@ import radius as rad @description('Radius application ID') param application string -@description('Cotnainer image tag to use for eshop images') +@description('Container image tag to use for eshop images') param TAG string @description('Optional App Insights Key') @@ -54,7 +54,7 @@ resource basket 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/eshop/basket.api:${TAG}' + image: 'ghcr.io/radius-project/samples/eshop/basket.api:${TAG}' env: { ASPNETCORE_ENVIRONMENT: 'Development' ASPNETCORE_URLS: 'http://0.0.0.0:80' diff --git a/samples/eshop/iac/services/catalog.bicep b/samples/eshop/iac/services/catalog.bicep index b63479e1..a748fa01 100644 --- a/samples/eshop/iac/services/catalog.bicep +++ b/samples/eshop/iac/services/catalog.bicep @@ -28,7 +28,7 @@ param AZURESTORAGEENABLED string ]) param AZURESERVICEBUSENABLED string -@description('Cotnainer image tag to use for eshop images') +@description('Container image tag to use for eshop images') param TAG string @description('Name of the Gateway') @@ -61,7 +61,7 @@ resource catalog 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/eshop/catalog.api:${TAG}' + image: 'ghcr.io/radius-project/samples/eshop/catalog.api:${TAG}' env: { UseCustomizationData: 'False' PATH_BASE: '/catalog-api' diff --git a/samples/eshop/iac/services/identity.bicep b/samples/eshop/iac/services/identity.bicep index 4bcce43d..bece6369 100644 --- a/samples/eshop/iac/services/identity.bicep +++ b/samples/eshop/iac/services/identity.bicep @@ -15,7 +15,7 @@ param APPLICATION_INSIGHTS_KEY string ]) param ENABLEDEVSPACES string -@description('Cotnainer image tag to use for eshop images. Defaults to linux-dotnet7') +@description('Container image tag to use for eshop images') param TAG string @description('Name of the Gateway') @@ -56,7 +56,7 @@ resource identity 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/eshop/identity.api:${TAG}' + image: 'ghcr.io/radius-project/samples/eshop/identity.api:${TAG}' env: { PATH_BASE: '/identity-api' ASPNETCORE_ENVIRONMENT: 'Development' diff --git a/samples/eshop/iac/services/ordering.bicep b/samples/eshop/iac/services/ordering.bicep index fa5018c4..040fac7e 100644 --- a/samples/eshop/iac/services/ordering.bicep +++ b/samples/eshop/iac/services/ordering.bicep @@ -21,7 +21,7 @@ param APPLICATION_INSIGHTS_KEY string ]) param AZURESERVICEBUSENABLED string -@description('Cotnainer image tag to use for eshop images') +@description('Container image tag to use for eshop images') param TAG string @description('Name of the Gateway') @@ -69,7 +69,7 @@ resource ordering 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/eshop/ordering.api:${TAG}' + image: 'ghcr.io/radius-project/samples/eshop/ordering.api:${TAG}' env: { ASPNETCORE_ENVIRONMENT: 'Development' ASPNETCORE_URLS: 'http://0.0.0.0:80' @@ -119,7 +119,7 @@ resource orderbgtasks 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/eshop/ordering.backgroundtasks:${TAG}' + image: 'ghcr.io/radius-project/samples/eshop/ordering.backgroundtasks:${TAG}' env: { ASPNETCORE_ENVIRONMENT: 'Development' ASPNETCORE_URLS: 'http://0.0.0.0:80' @@ -156,7 +156,7 @@ resource orderingsignalrhub 'Applications.Core/containers@2023-10-01-preview' = properties: { application: application container: { - image: 'radius.azurecr.io/eshop/ordering.signalrhub:${TAG}' + image: 'ghcr.io/radius-project/samples/eshop/ordering.signalrhub:${TAG}' env: { PATH_BASE: '/payment-api' ASPNETCORE_ENVIRONMENT: 'Development' diff --git a/samples/eshop/iac/services/payment.bicep b/samples/eshop/iac/services/payment.bicep index e0fa6f08..3fa8a941 100644 --- a/samples/eshop/iac/services/payment.bicep +++ b/samples/eshop/iac/services/payment.bicep @@ -21,7 +21,7 @@ param APPLICATION_INSIGHTS_KEY string ]) param AZURESERVICEBUSENABLED string -@description('Cotnainer image tag to use for eshop images') +@description('Container image tag to use for eshop images') param TAG string @description('Name of the Payment HTTP route') @@ -42,7 +42,7 @@ resource payment 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/eshop/payment.api:${TAG}' + image: 'ghcr.io/radius-project/samples/eshop/payment.api:${TAG}' env: { ApplicationInsights__InstrumentationKey: APPLICATION_INSIGHTS_KEY 'Serilog__MinimumLevel__Override__payment-api.IntegrationEvents.EventHandling': 'Verbose' diff --git a/samples/eshop/iac/services/web.bicep b/samples/eshop/iac/services/web.bicep index c075f186..e82bc44e 100644 --- a/samples/eshop/iac/services/web.bicep +++ b/samples/eshop/iac/services/web.bicep @@ -14,7 +14,7 @@ param ORCHESTRATOR_TYPE string @description('Optional App Insights Key') param APPLICATION_INSIGHTS_KEY string -@description('Cotnainer image tag to use for eshop images') +@description('Container image tag to use for eshop images') param TAG string @description('Name of the Gateway') @@ -49,7 +49,7 @@ resource webspa 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/eshop/webspa:${TAG}' + image: 'ghcr.io/radius-project/samples/eshop/webspa:${TAG}' env: { PATH_BASE: '/' ASPNETCORE_ENVIRONMENT: 'Production' @@ -103,7 +103,7 @@ resource webmvc 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/eshop/webmvc:${TAG}' + image: 'ghcr.io/radius-project/samples/eshop/webmvc:${TAG}' env: { ASPNETCORE_ENVIRONMENT: 'Development' ASPNETCORE_URLS: 'http://0.0.0.0:80' diff --git a/samples/eshop/iac/services/webhooks.bicep b/samples/eshop/iac/services/webhooks.bicep index 90993388..ec8c3797 100644 --- a/samples/eshop/iac/services/webhooks.bicep +++ b/samples/eshop/iac/services/webhooks.bicep @@ -18,7 +18,7 @@ param ORCHESTRATOR_TYPE string ]) param AZURESERVICEBUSENABLED string -@description('Cotnainer image tag to use for eshop images. Defaults to linux-dotnet7') +@description('Container image tag to use for eshop images') param TAG string @description('Name of the Gateway') @@ -51,7 +51,7 @@ resource webhooks 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/eshop/webhooks.api:${TAG}' + image: 'ghcr.io/radius-project/samples/eshop/webhooks.api:${TAG}' env: { PATH_BASE: '/webhooks-api' ASPNETCORE_ENVIRONMENT: 'Development' @@ -90,7 +90,7 @@ resource webhooksclient 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/eshop/webhooks.client:${TAG}' + image: 'ghcr.io/radius-project/samples/eshop/webhooks.client:${TAG}' env: { ASPNETCORE_ENVIRONMENT: 'Production' ASPNETCORE_URLS: 'http://0.0.0.0:80' diff --git a/samples/eshop/iac/services/webshopping.bicep b/samples/eshop/iac/services/webshopping.bicep index 09bda8fd..a30ac769 100644 --- a/samples/eshop/iac/services/webshopping.bicep +++ b/samples/eshop/iac/services/webshopping.bicep @@ -11,7 +11,7 @@ param application string ]) param ORCHESTRATOR_TYPE string -@description('Cotnainer image tag to use for eshop images') +@description('Container image tag to use for eshop images') param TAG string @description('Name of the Gateway') @@ -59,7 +59,7 @@ resource webshoppingagg 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/eshop/webshoppingagg:${TAG}' + image: 'ghcr.io/radius-project/samples/eshop/webshoppingagg:${TAG}' env: { ASPNETCORE_ENVIRONMENT: 'Development' PATH_BASE: '/webshoppingagg' @@ -119,7 +119,7 @@ resource webshoppingapigw 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/eshop-envoy:0.1.4' + image: 'ghcr.io/radius-project/samples/eshop/envoy:latest' ports: { http: { containerPort: 80 diff --git a/samples/eshop/iac/services/webstatus.bicep b/samples/eshop/iac/services/webstatus.bicep index 45292539..ea5bac82 100644 --- a/samples/eshop/iac/services/webstatus.bicep +++ b/samples/eshop/iac/services/webstatus.bicep @@ -14,7 +14,7 @@ param ORCHESTRATOR_TYPE string @description('Optional App Insights Key') param APPLICATION_INSIGHTS_KEY string -@description('Cotnainer image tag to use for eshop images') +@description('Container image tag to use for eshop images') param TAG string @description('Basket Http Route name') @@ -58,7 +58,7 @@ resource webstatus 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/eshop/webstatus:${TAG}' + image: 'ghcr.io/radius-project/samples/eshop/webstatus:${TAG}' env: { ASPNETCORE_ENVIRONMENT: 'Development' ASPNETCORE_URLS: 'http://0.0.0.0:80' diff --git a/samples/volumes/app.bicep b/samples/volumes/app.bicep index 2ef6aaad..9654f1a3 100644 --- a/samples/volumes/app.bicep +++ b/samples/volumes/app.bicep @@ -14,7 +14,7 @@ resource container 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: app.id container: { - image: 'radius.azurecr.io/quickstarts/volumes:edge' + image: 'ghcr.io/radius-project/samples/volumes:latest' volumes: { temp: { kind: 'ephemeral'