Merge branch 'v0.26' into edge

Signed-off-by: Aaron Crawfis <[email protected]>

.devcontainer/devcontainer.json

@@ -3,6 +3,7 @@
 	"image": "mcr.microsoft.com/devcontainers/universal:linux",
 	"workspaceFolder": "/workspaces/samples",
 	"onCreateCommand": "bash ./.devcontainer/on-create.sh",
+	"postCreateCommand": "bash ./.devcontainer/post-create.sh",
 	"runArgs": [
 	  "--privileged",
 	  "--init"

.devcontainer/on-create.sh

@@ -1,14 +1,5 @@
 #!/bin/sh
 
-## Create a k3d cluster
-k3d cluster delete
-k3d cluster create -p '8081:80@loadbalancer' --k3s-arg '--disable=traefik@server:0'
-
-## Install Dapr and init
-wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash
-dapr uninstall # clean if needed
-dapr init -k
-
 ## Install rad CLI
 CURRENT_BRANCH=$(git branch --show-current)
 

.devcontainer/post-create.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+## Create a k3d cluster
+k3d cluster delete
+k3d cluster create -p '8081:80@loadbalancer' --k3s-arg '--disable=traefik@server:0'
+
+## Install Dapr and init
+wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash
+dapr uninstall # clean if needed
+dapr init -k

README.md

@@ -2,18 +2,22 @@
 
 This repository contains the source code for quickstarts, reference apps, and tutorials for Project Radius.
 
-To try out one of these samples, visit https://radapp.dev
+To try out one of these samples, visit https://docs.radapp.dev
 
-## Categories
+## Codespace
 
-The samples repo is broken down into three categories:
+The current repository offers a codespace setup with Radius and its dependencies installed.  Try it out for free!
 
-| Sample category | Description | Docs |
-|-----------------|-------------|------|
-| [First app](demo/) | The main guide to try out and learn the breadth of Project Radius concepts and features | [First-app](https://radapp.dev/getting-started/first-app/) |
-| [Quickstarts](quickstarts/) | Focused how-to guides on specific Project Radius scenarios and features | [Quickstarts](https://radapp.dev/getting-started/quickstarts/) |
-| [Reference apps](reference-apps/) | Templates showing "radified" applications that can be used as a starting point for your own apps | [Reference apps](https://radapp.dev/getting-started/reference-apps/) |
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/radius-project/samples)
 
-## Codespace
+## Samples
 
-The current repository offers a codespace setup with Radius and its dependencies installed. At startup time the codespace will automatically create a Radius local development environment. For more instructions on how to use the codespace see the official docs page: https://docs.radapp.dev/getting-started/install/
+| Sample | Description |
+|--------|-------------|
+| **demo** | The "swiss army knife" sample for Radius. Displays environment variables, networking information, Radius connections, and more.
+| **aws** | A simple app to interact with AWS S3
+| **aws-sqs** | A simple app to interact with AWS SQS
+| **dapr** | A 2-tier app leveraging Dapr building blocks
+| **eshop** | A Rad-ified version of eShop on Containers, the .NET reference app
+| **eshop-dapr** | A Rad-ified version of eShop on Dapr
+| **volumes** | An app to interact with mounted volumes