From afd016b94a86f447d903e7ad1f294401827007a7 Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Thu, 12 Oct 2023 09:50:43 -0700 Subject: [PATCH] Update references to sample images (#828) * Remove env-var howto guide * Rename sample references * Update docs/content/getting-started/index.md Co-authored-by: Reshma Abdul Rahim <61033581+Reshrahim@users.noreply.github.com> --------- Co-authored-by: Reshma Abdul Rahim <61033581+Reshrahim@users.noreply.github.com> Signed-off-by: jasonviviano <83607984+jasonviviano@users.noreply.github.com> --- .../content/community/contributing/contributing-docs/index.md | 4 ++-- docs/content/getting-started/index.md | 2 +- .../getting-started/snippets/app-with-redis-snippets.bicep | 2 +- docs/content/getting-started/snippets/app-with-redis.bicep | 2 +- docs/content/getting-started/snippets/app.bicep | 2 +- .../author-apps/aws/howto-aws-resources/snippets/app.bicep | 2 +- .../author-apps/aws/howto-aws-resources/snippets/s3app.bicep | 2 +- .../guides/author-apps/aws/overview/snippets/aws.bicep | 2 +- .../guides/author-apps/containers/howto-volumes/index.md | 2 +- .../author-apps/containers/howto-volumes/snippets/1-app.bicep | 2 +- .../author-apps/containers/howto-volumes/snippets/2-app.bicep | 2 +- .../author-apps/networking/howto-gateways/snippets/app.bicep | 2 +- .../networking/howto-service-networking/snippets/1-app.bicep | 2 +- .../networking/howto-service-networking/snippets/2-app.bicep | 2 +- .../networking/howto-tls/snippets/app-existing.bicep | 2 +- .../author-apps/networking/howto-tls/snippets/app-new.bicep | 2 +- docs/content/tutorials/eshop/_index.md | 2 +- docs/content/tutorials/tutorial-dapr/snippets/dapr.bicep | 4 ++-- docs/content/tutorials/tutorial-recipe/snippets/app.bicep | 2 +- holding-pen/reference-apps/aws-sqs/snippets/app.bicep | 4 ++-- holding-pen/reference-apps/eshop-dapr/_index.md | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/content/community/contributing/contributing-docs/index.md b/docs/content/community/contributing/contributing-docs/index.md index 07627de4a..1e1df92dc 100644 --- a/docs/content/community/contributing/contributing-docs/index.md +++ b/docs/content/community/contributing/contributing-docs/index.md @@ -532,10 +532,10 @@ You can also reference pages in your button as well: You can link to a GitHub repo and path with the `githubRepo` and `githubPath` parameters: ``` -{{}} +{{}} ``` -{{< button text="My Button" githubRepo="samples" githubPath="reference-apps" >}} +{{< button text="My Button" githubRepo="samples" githubPath="samples" >}} #### Button colors diff --git a/docs/content/getting-started/index.md b/docs/content/getting-started/index.md index 5a2a5cb44..614dca12a 100644 --- a/docs/content/getting-started/index.md +++ b/docs/content/getting-started/index.md @@ -67,7 +67,7 @@ In addition to starting Radius services in your Kubernetes cluster, this initial {{< rad file="snippets/app.bicep" embed=true markdownConfig="{linenos=table,linenostart=1}" >}} -> This file will run the `radius.azurecr.io/tutorial/webapp` image. This image is published by the Radius team to a public registry, you do not need to create it. +> This file will run the `radius.azurecr.io/samples/demo` image. This image is published by the Radius team to a public registry, you do not need to create it. ## 4. Run the app diff --git a/docs/content/getting-started/snippets/app-with-redis-snippets.bicep b/docs/content/getting-started/snippets/app-with-redis-snippets.bicep index 10a2dd5fb..5309bffa9 100644 --- a/docs/content/getting-started/snippets/app-with-redis-snippets.bicep +++ b/docs/content/getting-started/snippets/app-with-redis-snippets.bicep @@ -10,7 +10,7 @@ resource demo 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/tutorial/webapp:edge' + image: 'radius.azurecr.io/samples/demo:latest' ports: { web: { containerPort: 3000 diff --git a/docs/content/getting-started/snippets/app-with-redis.bicep b/docs/content/getting-started/snippets/app-with-redis.bicep index 52704f0f0..4680d2acd 100644 --- a/docs/content/getting-started/snippets/app-with-redis.bicep +++ b/docs/content/getting-started/snippets/app-with-redis.bicep @@ -9,7 +9,7 @@ resource demo 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/tutorial/webapp:edge' + image: 'radius.azurecr.io/samples/demo:latest' ports: { web: { containerPort: 3000 diff --git a/docs/content/getting-started/snippets/app.bicep b/docs/content/getting-started/snippets/app.bicep index 9d95b8ba9..334c0c027 100644 --- a/docs/content/getting-started/snippets/app.bicep +++ b/docs/content/getting-started/snippets/app.bicep @@ -9,7 +9,7 @@ resource demo 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/tutorial/webapp:edge' + image: 'radius.azurecr.io/samples/demo:latest' ports: { web: { containerPort: 3000 diff --git a/docs/content/guides/author-apps/aws/howto-aws-resources/snippets/app.bicep b/docs/content/guides/author-apps/aws/howto-aws-resources/snippets/app.bicep index be351c82c..70e2a1c43 100644 --- a/docs/content/guides/author-apps/aws/howto-aws-resources/snippets/app.bicep +++ b/docs/content/guides/author-apps/aws/howto-aws-resources/snippets/app.bicep @@ -45,7 +45,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: 'radius.azurecr.io/samples/aws:latest' } } } diff --git a/docs/content/guides/author-apps/aws/howto-aws-resources/snippets/s3app.bicep b/docs/content/guides/author-apps/aws/howto-aws-resources/snippets/s3app.bicep index 360b11b89..76a5f1cc4 100644 --- a/docs/content/guides/author-apps/aws/howto-aws-resources/snippets/s3app.bicep +++ b/docs/content/guides/author-apps/aws/howto-aws-resources/snippets/s3app.bicep @@ -46,7 +46,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: 'radius.azurecr.io/samples/aws:latest' } } } diff --git a/docs/content/guides/author-apps/aws/overview/snippets/aws.bicep b/docs/content/guides/author-apps/aws/overview/snippets/aws.bicep index d2717c515..04f8cfa6c 100644 --- a/docs/content/guides/author-apps/aws/overview/snippets/aws.bicep +++ b/docs/content/guides/author-apps/aws/overview/snippets/aws.bicep @@ -41,7 +41,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: 'radius.azurecr.io/samples/aws:latest' } } } diff --git a/docs/content/guides/author-apps/containers/howto-volumes/index.md b/docs/content/guides/author-apps/containers/howto-volumes/index.md index 327145a45..53d6434ed 100644 --- a/docs/content/guides/author-apps/containers/howto-volumes/index.md +++ b/docs/content/guides/author-apps/containers/howto-volumes/index.md @@ -24,7 +24,7 @@ Begin by creating a file named `app.bicep` with a Radius Application and [contai {{< rad file="snippets/1-app.bicep" embed=true >}} -The `quickstarts/volumes` container will display the status and contents of the `/tmpdir` directory within the container. +The `samples/volumes` container will display the status and contents of the `/tmpdir` directory within the container. ## Step 2: Deploy the app and container diff --git a/docs/content/guides/author-apps/containers/howto-volumes/snippets/1-app.bicep b/docs/content/guides/author-apps/containers/howto-volumes/snippets/1-app.bicep index 97e9dd7a7..753e50052 100644 --- a/docs/content/guides/author-apps/containers/howto-volumes/snippets/1-app.bicep +++ b/docs/content/guides/author-apps/containers/howto-volumes/snippets/1-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: 'radius.azurecr.io/samples/volumes:latest' } } } diff --git a/docs/content/guides/author-apps/containers/howto-volumes/snippets/2-app.bicep b/docs/content/guides/author-apps/containers/howto-volumes/snippets/2-app.bicep index e470e0d02..303d67575 100644 --- a/docs/content/guides/author-apps/containers/howto-volumes/snippets/2-app.bicep +++ b/docs/content/guides/author-apps/containers/howto-volumes/snippets/2-app.bicep @@ -15,7 +15,7 @@ resource container 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: app.id container: { - image: 'radius.azurecr.io/quickstarts/volumes:edge' + image: 'radius.azurecr.io/samples/volumes:latest' volumes: { tmp: { kind: 'ephemeral' diff --git a/docs/content/guides/author-apps/networking/howto-gateways/snippets/app.bicep b/docs/content/guides/author-apps/networking/howto-gateways/snippets/app.bicep index 7a8e392a1..a82b82578 100644 --- a/docs/content/guides/author-apps/networking/howto-gateways/snippets/app.bicep +++ b/docs/content/guides/author-apps/networking/howto-gateways/snippets/app.bicep @@ -9,7 +9,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/tutorials/webapp:edge' + image: 'radius.azurecr.io/samples/demo:latest' ports: { web: { containerPort: 3000 diff --git a/docs/content/guides/author-apps/networking/howto-service-networking/snippets/1-app.bicep b/docs/content/guides/author-apps/networking/howto-service-networking/snippets/1-app.bicep index bba37c060..5944b0fe0 100644 --- a/docs/content/guides/author-apps/networking/howto-service-networking/snippets/1-app.bicep +++ b/docs/content/guides/author-apps/networking/howto-service-networking/snippets/1-app.bicep @@ -8,7 +8,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/tutorial/webapp:edge' + image: 'radius.azurecr.io/samples/demo:latest' ports: { web: { containerPort: 3000 diff --git a/docs/content/guides/author-apps/networking/howto-service-networking/snippets/2-app.bicep b/docs/content/guides/author-apps/networking/howto-service-networking/snippets/2-app.bicep index 51826c363..ccee12e68 100644 --- a/docs/content/guides/author-apps/networking/howto-service-networking/snippets/2-app.bicep +++ b/docs/content/guides/author-apps/networking/howto-service-networking/snippets/2-app.bicep @@ -9,7 +9,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/tutorial/webapp:edge' + image: 'radius.azurecr.io/samples/demo:latest' ports: { web: { containerPort: 3000 diff --git a/docs/content/guides/author-apps/networking/howto-tls/snippets/app-existing.bicep b/docs/content/guides/author-apps/networking/howto-tls/snippets/app-existing.bicep index bd5f93a6b..e4842a0ac 100644 --- a/docs/content/guides/author-apps/networking/howto-tls/snippets/app-existing.bicep +++ b/docs/content/guides/author-apps/networking/howto-tls/snippets/app-existing.bicep @@ -9,7 +9,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/tutorials/webapp:edge' + image: 'radius.azurecr.io/samples/demo:latest' ports: { web: { containerPort: 3000 diff --git a/docs/content/guides/author-apps/networking/howto-tls/snippets/app-new.bicep b/docs/content/guides/author-apps/networking/howto-tls/snippets/app-new.bicep index 7987ff602..a44d07360 100644 --- a/docs/content/guides/author-apps/networking/howto-tls/snippets/app-new.bicep +++ b/docs/content/guides/author-apps/networking/howto-tls/snippets/app-new.bicep @@ -9,7 +9,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/tutorials/webapp:edge' + image: 'radius.azurecr.io/samples/demo:latest' ports: { web: { containerPort: 3000 diff --git a/docs/content/tutorials/eshop/_index.md b/docs/content/tutorials/eshop/_index.md index 93b8577e8..59c8a382a 100644 --- a/docs/content/tutorials/eshop/_index.md +++ b/docs/content/tutorials/eshop/_index.md @@ -38,6 +38,6 @@ Adding Radius to the eShop on containers application allows teams to: - Easily manage configuration and credentials between infrastructure and services, all within the app model - Simplify deployment with Bicep and Azure Resource Manager (ARM) -{{< button text="View eShop reference app in samples" githubRepo="samples" githubPath="reference-apps/eshop" color="success" size="btn-lg" >}} +{{< button text="View eShop reference app in samples" githubRepo="samples" githubPath="samples/eshop" color="success" size="btn-lg" >}} *Visit the [GitHub docs]({{< ref github >}}) if you need access to the organization* \ No newline at end of file diff --git a/docs/content/tutorials/tutorial-dapr/snippets/dapr.bicep b/docs/content/tutorials/tutorial-dapr/snippets/dapr.bicep index 3102a6925..e21686369 100644 --- a/docs/content/tutorials/tutorial-dapr/snippets/dapr.bicep +++ b/docs/content/tutorials/tutorial-dapr/snippets/dapr.bicep @@ -18,7 +18,7 @@ resource backend 'Applications.Core/containers@2023-10-01-preview' = { application: app.id container: { // This image is where the app's backend code lives - image: 'radius.azurecr.io/quickstarts/dapr-backend:edge' + image: 'radius.azurecr.io/samples/dapr-backend:latest' ports: { orders: { containerPort: 3000 @@ -59,7 +59,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = { application: app.id container: { // This image is where the app's frontend code lives - image: 'radius.azurecr.io/quickstarts/dapr-frontend:edge' + image: 'radius.azurecr.io/samples/dapr-frontend:latest' env: { // An environment variable to tell the frontend container where to find the backend CONNECTION_BACKEND_APPID: 'backend' diff --git a/docs/content/tutorials/tutorial-recipe/snippets/app.bicep b/docs/content/tutorials/tutorial-recipe/snippets/app.bicep index 5fc67ec65..c679705c1 100644 --- a/docs/content/tutorials/tutorial-recipe/snippets/app.bicep +++ b/docs/content/tutorials/tutorial-recipe/snippets/app.bicep @@ -11,7 +11,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = { properties: { application: application container: { - image: 'radius.azurecr.io/tutorial/webapp:edge' + image: 'radius.azurecr.io/samples/demo:latest' } connections: { // Define a connection to the redis container diff --git a/holding-pen/reference-apps/aws-sqs/snippets/app.bicep b/holding-pen/reference-apps/aws-sqs/snippets/app.bicep index f588fd3b3..16f12d340 100644 --- a/holding-pen/reference-apps/aws-sqs/snippets/app.bicep +++ b/holding-pen/reference-apps/aws-sqs/snippets/app.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: 'radius.azurecr.io/samples/aws-sqs: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: 'radius.azurecr.io/samples/aws-sqs:latest' } } } diff --git a/holding-pen/reference-apps/eshop-dapr/_index.md b/holding-pen/reference-apps/eshop-dapr/_index.md index 8010f6e10..65de3e5a8 100644 --- a/holding-pen/reference-apps/eshop-dapr/_index.md +++ b/holding-pen/reference-apps/eshop-dapr/_index.md @@ -40,6 +40,6 @@ Radius allows the eShop on Dapr application to: - Simplify deployment with Bicep and Azure Resource Manager (ARM). No more custom deployment scripts or workflows. - Automatically generate and apply the backing Dapr component configurations from the resources or values provided within the Dapr building block resource definitions. -{{< button text="View eShop reference app in samples" githubRepo="samples" githubPath="reference-apps/eshop-dapr" color="success" size="btn-lg" >}} +{{< button text="View eShop reference app in samples" githubRepo="samples" githubPath="samples/eshop-dapr" color="success" size="btn-lg" >}} *Visit the [GitHub docs]({{< ref github >}}) if you need access to the organization* \ No newline at end of file