Skip to content

Commit

Permalink
linting
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredfholgate committed Sep 11, 2024
1 parent f90b451 commit fdedf23
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ Description: The images to build and push to the container registry. This is onl

- task\_name: The name of the task to create for building the image (e.g. `image-build-task`)
- dockerfile\_path: The path to the Dockerfile to use for building the image (e.g. `dockerfile`)
- context\_path: The path to the context of the Dockerfile in three sections `<repository-url>#<repository-commit>:<repository-folder-path>` (e.g. https://github.com/Azure/terraform-azurerm-avm-ptn-cicd-agents-and-runners#8ff4b85:container-images/azure-devops-agent)
- context\_path: The path to the context of the Dockerfile in three sections `<repository-url>#<repository-commit>:<repository-folder-path>` (e.g. https://github.com/Azure/avm-container-images-cicd-agents-and-runners#bc4087f:azure-devops-agent)
- context\_access\_token: The access token to use for accessing the context. Supply a PAT if targetting a private repository.
- image\_names: A list of the names of the images to build (e.g. `["image-name:tag"]`)

Expand Down Expand Up @@ -585,7 +585,7 @@ Description: The default image repository commit to use if no custom image is pr

Type: `string`

Default: `"8051c83"`
Default: `"bc4087f"`

### <a name="input_default_image_repository_folder_paths"></a> [default\_image\_repository\_folder\_paths](#input\_default\_image\_repository\_folder\_paths)

Expand All @@ -597,10 +597,10 @@ Default:

```json
{
"azuredevops-container-app": "container-images/azure-devops-agent-aca",
"azuredevops-container-instance": "container-images/azure-devops-agent-aci",
"github-container-app": "container-images/github-runner-aca",
"github-container-instance": "container-images/github-runner-aci"
"azuredevops-container-app": "azure-devops-agent-aca",
"azuredevops-container-instance": "azure-devops-agent-aci",
"github-container-app": "github-runner-aca",
"github-container-instance": "github-runner-aci"
}
```

Expand All @@ -610,7 +610,7 @@ Description: The default image repository URL to use if no custom image is provi

Type: `string`

Default: `"https://github.com/Azure/terraform-azurerm-avm-ptn-cicd-agents-and-runners"`
Default: `"https://github.com/Azure/avm-container-images-cicd-agents-and-runners"`

### <a name="input_delays"></a> [delays](#input\_delays)

Expand Down
2 changes: 2 additions & 0 deletions modules/container-instance/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ resource "azurerm_container_group" "alz" {
}
dynamic "image_registry_credential" {
for_each = var.container_registry_username != null ? ["custom"] : []
content {
server = var.container_registry_login_server
password = var.container_registry_password
Expand All @@ -43,6 +44,7 @@ resource "azurerm_container_group" "alz" {
}
dynamic "image_registry_credential" {
for_each = var.container_registry_username == null ? ["default"] : []
content {
server = var.container_registry_login_server
user_assigned_identity_id = var.user_assigned_managed_identity_id
Expand Down
2 changes: 2 additions & 0 deletions modules/container-instance/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ resource "azurerm_container_group" "alz" {
}
dynamic "image_registry_credential" {
for_each = var.container_registry_username != null ? ["custom"] : []

content {
server = var.container_registry_login_server
password = var.container_registry_password
Expand All @@ -37,6 +38,7 @@ resource "azurerm_container_group" "alz" {
}
dynamic "image_registry_credential" {
for_each = var.container_registry_username == null ? ["default"] : []

content {
server = var.container_registry_login_server
user_assigned_identity_id = var.user_assigned_managed_identity_id
Expand Down

0 comments on commit fdedf23

Please sign in to comment.