Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed azurecr references to ghcr #893

Merged
merged 7 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from 2 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 docs/content/getting-started/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,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/samples/demo` 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.ghcr.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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource demo 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/samples/demo:latest'
image: 'radius.ghcr.io/samples/demo:latest'
ports: {
web: {
containerPort: 3000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resource demo 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/samples/demo:latest'
image: 'radius.ghcr.io/samples/demo:latest'
ports: {
web: {
containerPort: 3000
Expand Down
2 changes: 1 addition & 1 deletion docs/content/getting-started/snippets/app.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resource demo 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/samples/demo:latest'
image: 'radius.ghcr.io/samples/demo:latest'
ports: {
web: {
containerPort: 3000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/samples/aws:latest'
image: 'radius.ghcr.io/samples/aws:latest'
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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/samples/aws:latest'
image: 'radius.ghcr.io/samples/aws:latest'
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/samples/aws:latest'
image: 'radius.ghcr.io/samples/aws:latest'
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ resource container 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: app.id
container: {
image: 'ghcr.io/azure/azure-workload-identity/msal-go:latest'
image: 'radius.ghcr.io/azure/azure-workload-identity/msal-go:latest'
env: {
KEYVAULT_NAME: keyvault.name
KEYVAULT_URL: keyvault.properties.vaultUri
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource demo 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/samples/demo:latest'
image: 'radius.ghcr.io/samples/demo:latest'
ports: {
web: {
containerPort: 3000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resource demo 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/samples/demo:latest'
image: 'radius.ghcr.io/samples/demo:latest'
ports: {
web: {
containerPort: 3000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ resource container 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: app.id
container: {
image: 'radius.azurecr.io/samples/volumes:latest'
image: 'radius.ghcr.io/samples/volumes:latest'
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ resource container 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: app.id
container: {
image: 'radius.azurecr.io/samples/volumes:latest'
image: 'radius.ghcr.io/samples/volumes:latest'
volumes: {
tmp: {
kind: 'ephemeral'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/samples/demo:latest'
image: 'radius.ghcr.io/samples/demo:latest'
ports: {
web: {
containerPort: 3000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/samples/demo:latest'
image: 'radius.ghcr.io/samples/demo:latest'
ports: {
web: {
containerPort: 3000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/samples/demo:latest'
image: 'radius.ghcr.io/samples/demo:latest'
ports: {
web: {
containerPort: 3000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/samples/demo:latest'
image: 'radius.ghcr.io/samples/demo:latest'
ports: {
web: {
containerPort: 3000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/samples/demo:latest'
image: 'radius.ghcr.io/samples/demo:latest'
ports: {
web: {
containerPort: 3000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ Radius Environments can be setup with the rad CLI via two paths: interactive or
```
```
NAME TYPE TEMPLATE KIND TEMPLATE
default Applications.Datastores/mongoDatabases bicep radius.azurecr.io/recipes/dev/mongodatabases:latest
default Applications.Datastores/redisCaches bicep radius.azurecr.io/recipes/dev/rediscaches:latest
default Applications.Datastores/mongoDatabases bicep radius.ghcr.io/recipes/dev/mongodatabases:latest
default Applications.Datastores/redisCaches bicep radius.ghcr.io/recipes/dev/rediscaches:latest
```
You can follow the [Recipes]({{< ref "/guides/recipes/overview" >}}) documentation to learn more about the Recipes and how to use them in your application.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ rad install kubernetes --set global.zipkin.url=http://jaeger-collector.radius-mo

1. Begin by adding the Radius Helm repository:
```bash
helm repo add radius https://radius.azurecr.io/helm/v1/repo
helm repo add radius https://radius.ghcr.io/helm/v1/repo
helm repo update
```
1. Get all available versions:
Expand All @@ -47,10 +47,10 @@ rad install kubernetes --set global.zipkin.url=http://jaeger-collector.radius-mo
| `global.prometheus.enabled` | `true` | Enables Prometheus metrics. Defaults to `true`
| `global.prometheus.path` | `"/metrics"` | Metrics endpoint
| `global.prometheus.port` | `9090` | Metrics port
| `rp.image` | `radius.azurecr.io/appcore-rp` | Location of the Radius resource provider (RP) image
| `rp.image` | `radius.ghcr.io/appcore-rp` | Location of the Radius resource provider (RP) image
| `rp.tag` | `latest` | Tag of the Radius resource provider (RP) image
|`rp.publicEndpointOverride` | `""` | Public endpoint of the Kubernetes cluster. Overrides the default behavior of automatically detecting the public endpoint.
| `de.image` | `radius.azurecr.io/deployment-engine` | Location of the Bicep deployment engine (DE) image
| `de.image` | `radius.ghcr.io/deployment-engine` | Location of the Bicep deployment engine (DE) image
| `de.tag` | `latest` | Tag of the Bicep deployment engine (DE) image
| `ucp.image` | `radius.azurecr.io/ucpd` | Location of universal control plane (UCP) image
| `ucp.image` | `radius.ghcr.io/ucpd` | Location of universal control plane (UCP) image
| `ucp.tag` | `latest` | Tag of the universal control plane (UCP) image
4 changes: 2 additions & 2 deletions docs/content/guides/recipes/howto-author-recipes/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Resources are populated automatically for Bicep Recipes for any new Azure or AWS
Recipes leverage [Bicep registries](https://learn.microsoft.com/azure/azure-resource-manager/bicep/private-module-registry) for template storage. Once you've authored a Recipe, you can publish it to your preferred OCI-compliant registry with [`rad bicep publish`]({{< ref rad_bicep_publish >}}):

```bash
rad bicep publish --file myrecipe.bicep --target br:myregistry.azurecr.io/recipes/myrecipe:1.1.0
rad bicep publish --file myrecipe.bicep --target br:myregistry.ghcr.io/recipes/myrecipe:1.1.0
jasonviviano marked this conversation as resolved.
Show resolved Hide resolved
```

{{% /codetab %}}
Expand All @@ -129,7 +129,7 @@ Now that your Recipe template has been stored, you can add it your Radius Enviro
{{% codetab %}}

```bash
rad recipe register myrecipe --environment myenv --resource-type Applications.Datastores/redisCaches --template-kind bicep --template-path myregistry.azurecr.io/recipes/myrecipe:1.1.0
rad recipe register myrecipe --environment myenv --resource-type Applications.Datastores/redisCaches --template-kind bicep --template-path myregistry.ghcr.io/recipes/myrecipe:1.1.0
jasonviviano marked this conversation as resolved.
Show resolved Hide resolved
```

{{% /codetab %}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ resource env 'Applications.Core/environments@2023-10-01-preview' = {
'Applications.Datastores/redisCaches':{
'redis-bicep': {
templateKind: 'bicep'
templatePath: 'https://myregistry.azurecr.io/recipes/myrecipe:1.1.0'
templatePath: 'https://myregistry.ghcr.io/recipes/myrecipe:1.1.0'
jasonviviano marked this conversation as resolved.
Show resolved Hide resolved
// Optionally set parameters for all resources calling this Recipe
parameters: {
port: 3000
Expand Down
14 changes: 7 additions & 7 deletions docs/content/guides/recipes/howto-dev-recipes/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ Local development environments created by the rad init command include a set of

```
NAME TYPE TEMPLATE KIND TEMPLATE VERSION TEMPLATE
default Applications.Datastores/sqlDatabases bicep radius.azurecr.io/recipes/local-dev/sqldatabases:latest
default Applications.Messaging/rabbitMQQueues bicep radius.azurecr.io/recipes/local-dev/rabbitmqqueues:latest
default Applications.Dapr/pubSubBrokers bicep radius.azurecr.io/recipes/local-dev/pubsubbrokers:latest
default Applications.Dapr/secretStores bicep radius.azurecr.io/recipes/local-dev/secretstores:latest
default Applications.Dapr/stateStores bicep radius.azurecr.io/recipes/local-dev/statestores:latest
default Applications.Datastores/mongoDatabases bicep radius.azurecr.io/recipes/local-dev/mongodatabases:latest
default Applications.Datastores/redisCaches bicep radius.azurecr.io/recipes/local-dev/rediscaches:latest
default Applications.Datastores/sqlDatabases bicep radius.ghcr.io/recipes/local-dev/sqldatabases:latest
default Applications.Messaging/rabbitMQQueues bicep radius.ghcr.io/recipes/local-dev/rabbitmqqueues:latest
default Applications.Dapr/pubSubBrokers bicep radius.ghcr.io/recipes/local-dev/pubsubbrokers:latest
default Applications.Dapr/secretStores bicep radius.ghcr.io/recipes/local-dev/secretstores:latest
default Applications.Dapr/stateStores bicep radius.ghcr.io/recipes/local-dev/statestores:latest
default Applications.Datastores/mongoDatabases bicep radius.ghcr.io/recipes/local-dev/mongodatabases:latest
default Applications.Datastores/redisCaches bicep radius.ghcr.io/recipes/local-dev/rediscaches:latest
```
> Visit the [Recipes repo](https://github.com/radius-project/recipes) to learn more about the definition of these `local-dev` recipe templates.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.ghcr.io/tutorial/webapp:edge'
}
connections: {
// Define a connection to the redis container
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ weight: 300

| Key | Required | Description | Example |
|------|:--------:|-------------|---------|
| image | y | The registry and image to download and run in your container. Follows the format `<registry-hostname>:<port>/<image-name>:<tag>` where registry hostname is optional and defaults to the Docker public registry, port is optional and defaults to 443, tag is optional and defaults to `latest`.| `myregistry.azurecr.io/myimage:latest`
| image | y | The registry and image to download and run in your container. Follows the format `<registry-hostname>:<port>/<image-name>:<tag>` where registry hostname is optional and defaults to the Docker public registry, port is optional and defaults to 443, tag is optional and defaults to `latest`.| `myregistry.ghcr.io/myimage:latest`
jasonviviano marked this conversation as resolved.
Show resolved Hide resolved
| env | n | A list of environment variables to be set for the container. | `'ENV_VAR': 'value'`
| command | n | Entrypoint array. Overrides the container image's ENTRYPOINT. | `['/bin/sh']`
| args | n | Arguments to the entrypoint. Overrides the container image's CMD. | `['-c', 'while true; do echo hello; sleep 10;done']`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ spec:
spec:
containers:
- name: frontend
image: radiusdev.azurecr.io/magpie:latest
image: radiusdev.ghcr.io/magpie:latest
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
containers: [
{
name: 'log-collector'
image: 'radiusdev.azurecr.io/fluent/fluent-bit:2.1.8'
image: 'radiusdev.ghcr.io/fluent/fluent-bit:2.1.8'
}
]
hostNetwork: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Details on what to run and how to run it are defined in the `container` property
|------|:--------:|-------------|---------|
| \<recipe-name\> | y | The name of the Recipe. Must be unique within the resource-type. | `myrecipe`
| templateKind | y | Format of the template provided by the recipe. Allowed values: bicep | `'bicep'`
| templatePath | y | The path to the Recipe contents. For Bicep Recipes this is a Bicep module registry address. | `'mycr.azurecr.io/recipes/myrecipe:1.0'`
| templatePath | y | The path to the Recipe contents. For Bicep Recipes this is a Bicep module registry address. | `'mycr.ghcr.io/recipes/myrecipe:1.0'`
jasonviviano marked this conversation as resolved.
Show resolved Hide resolved
| parameters | n | A list of parameters to set on the Recipe for every Recipe usage and deployment. Can be overridden by the resource calling the Recipe. | `capacity: 1`

### extensions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ resource publisher 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: app.id
container: {
image: 'radius.azurecr.io/magpie:latest'
image: 'radius.ghcr.io/magpie:latest'
jasonviviano marked this conversation as resolved.
Show resolved Hide resolved
env: {
TWILIO_NUMBER: twilio.properties.fromNumber
TWILIO_SID: twilio.secrets('accountSid')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ resource publisher 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/magpie:latest'
image: 'radius.ghcr.io/magpie:latest'
jasonviviano marked this conversation as resolved.
Show resolved Hide resolved
env: {
TWILIO_NUMBER: twilio.properties.fromNumber
TWILIO_SID: twilio.secrets('accountSid')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ resource publisher 'Applications.Core/containers@2023-10-01-preview' = {
}
}
container: {
image: 'radius.azurecr.io/magpie:latest'
image: 'radius.ghcr.io/magpie:latest'
jasonviviano marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ resource myapp 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/magpie:latest'
image: 'radius.ghcr.io/magpie:latest'
jasonviviano marked this conversation as resolved.
Show resolved Hide resolved
}
connections: {
statestore: {
Expand Down
2 changes: 1 addition & 1 deletion docs/content/tutorials/new-app/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ In addition to containers, you can add dependencies like Redis caches, Dapr Stat

```
NAME TYPE TEMPLATE KIND TEMPLATE VERSION TEMPLATE
default Applications.Datastores/mongoDatabases bicep radius.azurecr.io/recipes/local-dev/mongodatabases:latest
default Applications.Datastores/mongoDatabases bicep radius.ghcr.io/recipes/local-dev/mongodatabases:latest

PARAMETER NAME TYPE DEFAULT VALUE MIN MAX
username string admin - -
Expand Down
2 changes: 1 addition & 1 deletion docs/content/tutorials/new-app/snippets/1-app.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -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.ghcr.io/tutorial/webapp:edge'
ports: {
web: {
containerPort: 3000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource demo 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/tutorial/demo:edge'
image: 'radius.ghcr.io/tutorial/demo:edge'
env: {
FOO: 'bar'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/tutorial/demo:edge'
image: 'radius.ghcr.io/tutorial/demo:edge'
env: {
FOO: 'bar'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
properties: {
application: application
container: {
image: 'radius.azurecr.io/tutorial/demo:edge'
image: 'radius.ghcr.io/tutorial/demo:edge'
env: {
FOO: 'bar'
}
Expand Down
4 changes: 2 additions & 2 deletions docs/content/tutorials/tutorial-dapr/snippets/dapr.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -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/samples/dapr-backend:latest'
image: 'radius.ghcr.io/samples/dapr-backend:latest'
ports: {
orders: {
containerPort: 3000
Expand Down Expand Up @@ -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/samples/dapr-frontend:latest'
image: 'radius.ghcr.io/samples/dapr-frontend:latest'
env: {
// An environment variable to tell the frontend container where to find the backend
CONNECTION_BACKEND_APPID: 'backend'
Expand Down
Loading
Loading