fix: grept apply

Azure · Sep 8, 2024 · 89f8fb0 · 89f8fb0
1 parent 5caefd9
commit 89f8fb0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/avm b/avm
@@ -27,7 +27,7 @@ fi
 # Check if we are running in a container
 # If we are then just run make directly
 if [ -z "$AVM_IN_CONTAINER" ]; then
-  $CONTAINER_RUNTIME run --pull always --user "$(id -u):$(id -g)" --rm $AZURE_VOLUME -v /etc/passwd:/etc/passwd -v /etc/group:/etc/group -v "$(pwd)":/src -w /src -e GITHUB_REPOSITORY -e GITHUB_REPOSITORY_OWNER mcr.microsoft.com/azterraform make "$1"
+  $CONTAINER_RUNTIME run --pull always --user "$(id -u):$(id -g)" --rm $AZURE_VOLUME -v /etc/passwd:/etc/passwd -v /etc/group:/etc/group -v "$(pwd)":/src -w /src -e GITHUB_REPOSITORY -e ARM_SUBSCRIPTION_ID -e GITHUB_REPOSITORY_OWNER mcr.microsoft.com/azterraform make "$1"
 else
   make "$1"
 fi
diff --git a/avm.bat b/avm.bat
@@ -18,6 +18,6 @@ IF "%~1"=="" (
 )
 
 REM Run the make target with CONTAINER_RUNTIME
-%CONTAINER_RUNTIME% run --pull always --rm -v "%cd%":/src -w /src --user "1000:1000" -e GITHUB_REPOSITORY -e GITHUB_REPOSITORY_OWNER mcr.microsoft.com/azterraform make %1
+%CONTAINER_RUNTIME% run --pull always --rm -v "%cd%":/src -w /src --user "1000:1000" -e ARM_SUBSCRIPTION_ID -e GITHUB_REPOSITORY -e GITHUB_REPOSITORY_OWNER mcr.microsoft.com/azterraform make %1
 
 ENDLOCAL
diff --git a/modules/container-instance/README.md b/modules/container-instance/README.md
@@ -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
@@ -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

diff --git a/modules/container-instance/main.tf b/modules/container-instance/main.tf
@@ -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
@@ -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