From ac4a765b6e39aa6b92fc072b9764197d2852b229 Mon Sep 17 00:00:00 2001 From: nithyatsu Date: Thu, 26 Oct 2023 13:45:24 -0700 Subject: [PATCH] use local registry --- .github/workflows/build.yaml | 14 ++++++-------- .github/workflows/test.yaml | 12 +++++++----- samples/aws-sqs/sqs.bicep | 4 ++-- samples/aws/awss3.bicep | 2 +- samples/dapr/dapr-azure.bicep | 4 ++-- samples/dapr/dapr.bicep | 4 ++-- samples/demo/Chart/values.yaml | 2 +- samples/demo/app.bicep | 2 +- samples/eshop-dapr/services/basket-api.bicep | 2 +- samples/eshop-dapr/services/blazor-client.bicep | 2 +- samples/eshop-dapr/services/catalog-api.bicep | 2 +- samples/eshop-dapr/services/identity-api.bicep | 2 +- samples/eshop-dapr/services/ordering-api.bicep | 2 +- samples/eshop-dapr/services/payment-api.bicep | 2 +- samples/eshop-dapr/services/webshopping-agg.bicep | 2 +- samples/eshop-dapr/services/webshopping-gw.bicep | 2 +- samples/eshop-dapr/services/webstatus.bicep | 2 +- samples/eshop/envoy/README.md | 4 ++-- samples/eshop/iac/services/basket.bicep | 2 +- samples/eshop/iac/services/catalog.bicep | 2 +- samples/eshop/iac/services/identity.bicep | 2 +- samples/eshop/iac/services/ordering.bicep | 6 +++--- samples/eshop/iac/services/payment.bicep | 2 +- samples/eshop/iac/services/web.bicep | 4 ++-- samples/eshop/iac/services/webhooks.bicep | 4 ++-- samples/eshop/iac/services/webshopping.bicep | 4 ++-- samples/eshop/iac/services/webstatus.bicep | 2 +- samples/volumes/app.bicep | 2 +- 28 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 272810c1..fac11d80 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,8 +18,8 @@ concurrency: env: VERSION: ${{ github.event.pull_request.number || 'latest' }} - # 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' }} + # Use local-registry/radius-project/dev for PR build. Otherwise, use local-registry/radius-project. + CONTAINER_REGISTRY: ${{ github.event.pull_request.number && 'mycluster-registry:5432/radius-project/dev' || 'mycluster-registry:5432/radius-project' }} # Set to true to push images to registry. PUSH_IMAGE: true @@ -50,12 +50,10 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + # - name: Login to Local Container Registry + # uses: docker/login-action@v2 + # with: + # registry: mycluster-registry:5432 - name: Build and push ${{ matrix.image }} uses: docker/build-push-action@v4 with: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ab60060e..2cf5d813 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -172,12 +172,14 @@ jobs: if: steps.gen-id.outputs.RUN_TEST == 'true' && matrix.credential != 'aws' run: wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash - name: Create k3d cluster + id: create-k3d-cluster if: steps.gen-id.outputs.RUN_TEST == 'true' && matrix.credential != 'aws' run: | echo "testing local registry ....................." - k3d cluster create --agents 2 -p "80:80@loadbalancer" --k3s-arg "--disable=traefik@server:0" --registry-create mycluster-registry - ANSWER="$(docker ps -f name=mycluster-registry --format \"{{.Ports}}\" | cut -d '-' -f 1 | cut -d ':' -f 2 )" - echo "answer=$ANSWER" + k3d cluster create --agents 2 -p "80:80@loadbalancer" --k3s-arg "--disable=traefik@server:0" --registry-create mycluster-registry:0.0.0.0:5432 + PORT="$(docker ps -f name=mycluster-registry --format \"{{.Ports}}\" | cut -d '-' -f 1 | cut -d ':' -f 2 )" + echo "answer=$PORT" + echo "REGISTRY_PORT=${PORT}" >> $GITHUB_OUTPUT - name: Install Dapr if: steps.gen-id.outputs.RUN_TEST == 'true' && steps.gen-id.outputs.ENABLE_DAPR == 'true' run: | @@ -216,8 +218,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 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 + rad recipe register default -e default -w default --template-kind bicep --template-path mycluster-registry:${{ steps.create-k3d-cluster.outputs.REGISTRY_PORT }}/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 mycluster-registry:${{ steps.create-k3d-cluster.outputs.REGISTRY_PORT }}/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 }} diff --git a/samples/aws-sqs/sqs.bicep b/samples/aws-sqs/sqs.bicep index 5902a0a6..343a11e1 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: 'ghcr.io/radius-project/samples/aws-sqs-sample:latest' + image: 'mycluster-registry:5432/radius-project/samples/aws-sqs-sample:latest' } } } @@ -61,7 +61,7 @@ resource consumer 'Applications.Core/containers@2023-10-01-preview' = { }, aws_credential ) - image: 'ghcr.io/radius-project/samples/aws-sqs-sample:latest' + image: 'mycluster-registry:5432/radius-project/samples/aws-sqs-sample:latest' } } } diff --git a/samples/aws/awss3.bicep b/samples/aws/awss3.bicep index 7e84671d..3eb5b642 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: 'ghcr.io/radius-project/samples/aws:latest' + image: 'mycluster-registry:5432/radius-project/samples/aws:latest' } } } diff --git a/samples/dapr/dapr-azure.bicep b/samples/dapr/dapr-azure.bicep index 8bc92681..73de948a 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: 'ghcr.io/radius-project/samples/dapr-backend:latest' + image: 'mycluster-registry:5432/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: 'ghcr.io/radius-project/samples/dapr-frontend:latest' + image: 'mycluster-registry:5432/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 85f9bcd3..7e9ab548 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: 'ghcr.io/radius-project/samples/dapr-backend:latest' + image: 'mycluster-registry:5432/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: 'ghcr.io/radius-project/samples/dapr-frontend:latest' + image: 'mycluster-registry:5432/radius-project/samples/dapr-frontend:latest' env: { CONNECTION_BACKEND_APPID: backend.name } diff --git a/samples/demo/Chart/values.yaml b/samples/demo/Chart/values.yaml index 9751b981..75752fe3 100644 --- a/samples/demo/Chart/values.yaml +++ b/samples/demo/Chart/values.yaml @@ -1,3 +1,3 @@ image: - repository: ghcr.io/radius-project/samples/demo + repository: mycluster-registry:5432/radius-project/samples/demo tag: latest \ No newline at end of file diff --git a/samples/demo/app.bicep b/samples/demo/app.bicep index 9ef4a41c..761a1ecb 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: 'ghcr.io/radius-project/samples/demo:latest' + image: 'mycluster-registry:5432/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 1ea2ac60..7c0ebddb 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: 'ghcr.io/radius-project/samples/eshopdapr/basket.api:rad-latest' + image: 'mycluster-registry:5432/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 5960b868..72f396fd 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: 'ghcr.io/radius-project/samples/eshopdapr/blazor.client:rad-latest' + image: 'mycluster-registry:5432/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 3eb1af01..8acd4923 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: 'ghcr.io/radius-project/samples/eshopdapr/catalog.api:rad-latest' + image: 'mycluster-registry:5432/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 8e67da7c..b1644d6b 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: 'ghcr.io/radius-project/samples/eshopdapr/identity.api:rad-latest' + image: 'mycluster-registry:5432/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 c4ca3526..9ada5d3a 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: 'ghcr.io/radius-project/samples/eshopdapr/ordering.api:rad-latest' + image: 'mycluster-registry:5432/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 b7cf58fc..08f5909d 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: 'ghcr.io/radius-project/samples/eshopdapr/payment.api:rad-latest' + image: 'mycluster-registry:5432/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 8481bf9c..a0b58a94 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: 'ghcr.io/radius-project/samples/eshopdapr/webshoppingagg:rad-latest' + image: 'mycluster-registry:5432/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 242e508c..9fc8f702 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: 'ghcr.io/radius-project/samples/eshopdapr/webshoppingapigw:rad-latest' + image: 'mycluster-registry:5432/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 e86204fa..6a013f81 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: 'ghcr.io/radius-project/samples/eshopdapr/webstatus:rad-latest' + image: 'mycluster-registry:5432/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 7e78fdaf..264e38aa 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 ghcr.io/radius-project/samples/eshop-envoy:0.1.`. +To build the docker image, run `docker build . -t mycluster-registry:5432/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 ghcr.io/radius-project/samples/eshop-envoy:0.1.`. +To push the image, run `az acr login -n radius` and then `docker push mycluster-registry:5432/radius-project/samples/eshop-envoy:0.1.`. diff --git a/samples/eshop/iac/services/basket.bicep b/samples/eshop/iac/services/basket.bicep index 9458be8f..064dcc53 100644 --- a/samples/eshop/iac/services/basket.bicep +++ b/samples/eshop/iac/services/basket.bicep @@ -54,7 +54,7 @@ resource basket 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'ghcr.io/radius-project/samples/eshop/basket.api:${TAG}' + image: 'mycluster-registry:5432/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 a748fa01..a3990da1 100644 --- a/samples/eshop/iac/services/catalog.bicep +++ b/samples/eshop/iac/services/catalog.bicep @@ -61,7 +61,7 @@ resource catalog 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'ghcr.io/radius-project/samples/eshop/catalog.api:${TAG}' + image: 'mycluster-registry:5432/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 bece6369..1d35c517 100644 --- a/samples/eshop/iac/services/identity.bicep +++ b/samples/eshop/iac/services/identity.bicep @@ -56,7 +56,7 @@ resource identity 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'ghcr.io/radius-project/samples/eshop/identity.api:${TAG}' + image: 'mycluster-registry:5432/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 040fac7e..a193fc45 100644 --- a/samples/eshop/iac/services/ordering.bicep +++ b/samples/eshop/iac/services/ordering.bicep @@ -69,7 +69,7 @@ resource ordering 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'ghcr.io/radius-project/samples/eshop/ordering.api:${TAG}' + image: 'mycluster-registry:5432/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: 'ghcr.io/radius-project/samples/eshop/ordering.backgroundtasks:${TAG}' + image: 'mycluster-registry:5432/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: 'ghcr.io/radius-project/samples/eshop/ordering.signalrhub:${TAG}' + image: 'mycluster-registry:5432/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 3fa8a941..7ba74ce1 100644 --- a/samples/eshop/iac/services/payment.bicep +++ b/samples/eshop/iac/services/payment.bicep @@ -42,7 +42,7 @@ resource payment 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'ghcr.io/radius-project/samples/eshop/payment.api:${TAG}' + image: 'mycluster-registry:5432/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 e82bc44e..3b2e16c3 100644 --- a/samples/eshop/iac/services/web.bicep +++ b/samples/eshop/iac/services/web.bicep @@ -49,7 +49,7 @@ resource webspa 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'ghcr.io/radius-project/samples/eshop/webspa:${TAG}' + image: 'mycluster-registry:5432/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: 'ghcr.io/radius-project/samples/eshop/webmvc:${TAG}' + image: 'mycluster-registry:5432/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 ec8c3797..99374cee 100644 --- a/samples/eshop/iac/services/webhooks.bicep +++ b/samples/eshop/iac/services/webhooks.bicep @@ -51,7 +51,7 @@ resource webhooks 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'ghcr.io/radius-project/samples/eshop/webhooks.api:${TAG}' + image: 'mycluster-registry:5432/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: 'ghcr.io/radius-project/samples/eshop/webhooks.client:${TAG}' + image: 'mycluster-registry:5432/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 a30ac769..30e18bb9 100644 --- a/samples/eshop/iac/services/webshopping.bicep +++ b/samples/eshop/iac/services/webshopping.bicep @@ -59,7 +59,7 @@ resource webshoppingagg 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'ghcr.io/radius-project/samples/eshop/webshoppingagg:${TAG}' + image: 'mycluster-registry:5432/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: 'ghcr.io/radius-project/samples/eshop/envoy:latest' + image: 'mycluster-registry:5432/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 ea5bac82..8fd600aa 100644 --- a/samples/eshop/iac/services/webstatus.bicep +++ b/samples/eshop/iac/services/webstatus.bicep @@ -58,7 +58,7 @@ resource webstatus 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'ghcr.io/radius-project/samples/eshop/webstatus:${TAG}' + image: 'mycluster-registry:5432/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 9654f1a3..0d7024f6 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: 'ghcr.io/radius-project/samples/volumes:latest' + image: 'mycluster-registry:5432/radius-project/samples/volumes:latest' volumes: { temp: { kind: 'ephemeral'