chore: Run var.custom_shell_commands in a separate shell provisioner

This ensures that the ec2-user is seen as member of the docker group
when executing commands.

Author: espizo

images/linux-al2023/github_agent.linux.pkr.hcl

@@ -143,15 +143,20 @@ build {
   ]
   provisioner "shell" {
     environment_vars = []
-    inline = concat([
+    inline = [
       "sudo dnf upgrade-minimal -y",
       "sudo dnf install -y amazon-cloudwatch-agent jq git docker",
       "sudo dnf install -y --allowerasing curl",
       "sudo systemctl enable docker.service",
       "sudo systemctl enable containerd.service",
       "sudo service docker start",
       "sudo usermod -a -G docker ec2-user",
-    ], var.custom_shell_commands)
+    ]
+  }
+
+  provisioner "shell" {
+    environment_vars = []
+    inline           = var.custom_shell_commands
   }
 
   provisioner "file" {

images/ubuntu-focal/github_agent.ubuntu.pkr.hcl

@@ -144,7 +144,7 @@ build {
     environment_vars = [
       "DEBIAN_FRONTEND=noninteractive"
     ]
-    inline = concat([
+    inline = [
       "sudo cloud-init status --wait",
       "sudo apt-get -y update",
       "sudo apt-get -y install ca-certificates curl gnupg lsb-release",
@@ -161,7 +161,12 @@ build {
       "sudo curl -f https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -o awscliv2.zip",
       "unzip awscliv2.zip",
       "sudo ./aws/install",
-    ], var.custom_shell_commands)
+    ]
+  }
+
+  provisioner "shell" {
+    environment_vars = []
+    inline           = var.custom_shell_commands
   }
 
   provisioner "file" {

images/ubuntu-jammy-arm64/github_agent.ubuntu.pkr.hcl

@@ -144,7 +144,7 @@ build {
     environment_vars = [
       "DEBIAN_FRONTEND=noninteractive"
     ]
-    inline = concat([
+    inline = [
       "sudo cloud-init status --wait",
       "sudo apt-get update",
       "sudo apt-get -y install ca-certificates curl gnupg lsb-release",
@@ -161,7 +161,12 @@ build {
       "sudo curl -f https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip -o awscliv2.zip",
       "unzip awscliv2.zip",
       "sudo ./aws/install",
-    ], var.custom_shell_commands)
+    ]
+  }
+
+  provisioner "shell" {
+    environment_vars = []
+    inline           = var.custom_shell_commands
   }
 
   provisioner "file" {

images/ubuntu-jammy/github_agent.ubuntu.pkr.hcl

@@ -144,7 +144,7 @@ build {
     environment_vars = [
       "DEBIAN_FRONTEND=noninteractive"
     ]
-    inline = concat([
+    inline = [
       "sudo cloud-init status --wait",
       "sudo apt-get -y update",
       "sudo apt-get -y install ca-certificates curl gnupg lsb-release",
@@ -161,7 +161,12 @@ build {
       "sudo curl -f https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -o awscliv2.zip",
       "unzip awscliv2.zip",
       "sudo ./aws/install",
-    ], var.custom_shell_commands)
+    ]
+  }
+
+  provisioner "shell" {
+    environment_vars = []
+    inline           = var.custom_shell_commands
   }
 
   provisioner "file" {

images/windows-core-2019/github_agent.windows.pkr.hcl

@@ -108,12 +108,18 @@ build {
   }
 
   provisioner "powershell" {
-    inline = concat([
+    inline = [
       templatefile("./windows-provisioner.ps1", {
         action_runner_url = "https://github.com/actions/runner/releases/download/v${local.runner_version}/actions-runner-win-x64-${local.runner_version}.zip"
       })
-    ], var.custom_shell_commands)
+    ]
   }
+
+  provisioner "powershell" {
+    environment_vars = []
+    inline           = var.custom_shell_commands
+  }
+
   post-processor "manifest" {
     output     = "manifest.json"
     strip_path = true

images/windows-core-2022/github_agent.windows.pkr.hcl

@@ -122,12 +122,18 @@ build {
   }
 
   provisioner "powershell" {
-    inline = concat([
+    inline = [
       templatefile("./windows-provisioner.ps1", {
         action_runner_url = "https://github.com/actions/runner/releases/download/v${local.runner_version}/actions-runner-win-x64-${local.runner_version}.zip"
       })
-    ], var.custom_shell_commands)
+    ]
   }
+
+  provisioner "powershell" {
+    environment_vars = []
+    inline           = var.custom_shell_commands
+  }
+
   post-processor "manifest" {
     output     = "manifest.json"
     strip_path = true