Update create_task.ps1 and main.tf

matifali · matifali · commit b030e0d16e23 · 2024-05-02T22:06:05.000+03:00
diff --git a/windows-in-docker/build/files/create_task.ps1 b/windows-in-docker/build/files/create_task.ps1
@@ -1,8 +1,14 @@
+# Get the current user in the format domain\username
+$currentUserId = whoami
+
+# Define the task properties
 $task = @{
-        TaskName = 'CoderAgent'
-        Action = (New-ScheduledTaskAction -Execute 'powershell.exe' -Argument '-sta -ExecutionPolicy Unrestricted -Command "$env:CODER_AGENT_TOKEN_FILE=\'C:\OEM\token\'; & C:\OEM\CoderAgent.ps1 *>>  C:\OEM\CoderAgent.log"')
-        Trigger = (New-ScheduledTaskTrigger -AtStartup), (New-ScheduledTaskTrigger -Once -At (Get-Date).AddSeconds(15))
-        Settings = (New-ScheduledTaskSettingsSet -DontStopOnIdleEnd -ExecutionTimeLimit ([TimeSpan]::FromDays(3650)) -Compatibility Win8)
-        Principal = (New-ScheduledTaskPrincipal -UserId 'vm\coder' -RunLevel Highest -LogonType S4U)
+    TaskName = 'CoderAgent'
+    Action = (New-ScheduledTaskAction -Execute 'powershell.exe' -Argument '-sta -ExecutionPolicy Unrestricted -Command "$env:CODER_AGENT_TOKEN_FILE=\'C:\OEM\token\'; & C:\OEM\CoderAgent.ps1 *>>  C:\OEM\CoderAgent.log"')
+    Trigger = @(New-ScheduledTaskTrigger -AtStartup, New-ScheduledTaskTrigger -Once -At (Get-Date).AddSeconds(15))
+    Settings = (New-ScheduledTaskSettingsSet -DontStopOnIdleEnd -ExecutionTimeLimit ([TimeSpan]::FromDays(3650)) -Compatibility Win8)
+    Principal = (New-ScheduledTaskPrincipal -UserId $currentUserId -RunLevel Highest -LogonType S4U)
 }
-Register-ScheduledTask @task -Force
+
+# Register the task
+Register-ScheduledTask @task -Force
diff --git a/windows-in-docker/main.tf b/windows-in-docker/main.tf
@@ -27,7 +27,7 @@ resource "local_file" "coder_agent_token" {
 }
 
 resource "docker_image" "dockurr" {
-  name = "dockurr/windows:latest"
+  name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}-dockurr"
   build {
     context = "./build"
   }
@@ -81,6 +81,7 @@ resource "docker_container" "dockurr" {
   devices {
     host_path = "/dev/kvm"
   }
+
   capabilities {
     add = ["NET_ADMIN"]
   }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ resource "local_file" "coder_agent_token" {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`resource "docker_image" "dockurr" {`
`30`		`- name = "dockurr/windows:latest"`
	`30`	`+ name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}-dockurr"`
`31`	`31`	`build {`
`32`	`32`	`context = "./build"`
`33`	`33`	`}`
`@@ -81,6 +81,7 @@ resource "docker_container" "dockurr" {`
`81`	`81`	`devices {`
`82`	`82`	`host_path = "/dev/kvm"`
`83`	`83`	`}`
	`84`	`+`
`84`	`85`	`capabilities {`
`85`	`86`	`add = ["NET_ADMIN"]`
`86`	`87`	`}`