From a659eb965009d0599c6359be4bbe4c3145e7c554 Mon Sep 17 00:00:00 2001
From: Pavel Iakovenko <paveliak@users.noreply.github.com>
Date: Tue, 9 Apr 2024 02:50:21 -0700
Subject: [PATCH] Configurable SSH port (#9660)

---
 images/macos/templates/macOS-12.anka.pkr.hcl       | 8 +++++++-
 images/macos/templates/macOS-13.anka.pkr.hcl       | 8 +++++++-
 images/macos/templates/macOS-13.arm64.anka.pkr.hcl | 8 +++++++-
 images/macos/templates/macOS-14.anka.pkr.hcl       | 8 +++++++-
 images/macos/templates/macOS-14.arm64.anka.pkr.hcl | 8 +++++++-
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl
index edd828b41..200946859 100644
--- a/images/macos/templates/macOS-12.anka.pkr.hcl
+++ b/images/macos/templates/macOS-12.anka.pkr.hcl
@@ -24,6 +24,11 @@ variable "source_vm_name" {
   type = string
 }
 
+variable "source_vm_port" {
+  type = number
+  default = 22
+}
+
 variable "source_vm_tag" {
   type = string
   default = ""
@@ -89,8 +94,9 @@ source "veertu-anka-vm-clone" "template" {
 
 source "null" "template" {
   ssh_host = "${var.source_vm_name}"
+  ssh_port = "${var.source_vm_port}"
   ssh_username = "${var.vm_username}"
-  ssh_password = "${var.vm_password}"
+  ssh_private_key_file = "${var.vm_password}"
   ssh_proxy_host = "${var.socks_proxy}"
 }
 
diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl
index ee57ed83d..5a358df12 100644
--- a/images/macos/templates/macOS-13.anka.pkr.hcl
+++ b/images/macos/templates/macOS-13.anka.pkr.hcl
@@ -24,6 +24,11 @@ variable "source_vm_name" {
   type = string
 }
 
+variable "source_vm_port" {
+  type = number
+  default = 22
+}
+
 variable "source_vm_tag" {
   type = string
   default = ""
@@ -89,8 +94,9 @@ source "veertu-anka-vm-clone" "template" {
 
 source "null" "template" {
   ssh_host = "${var.source_vm_name}"
+  ssh_port = "${var.source_vm_port}"
   ssh_username = "${var.vm_username}"
-  ssh_password = "${var.vm_password}"
+  ssh_private_key_file = "${var.vm_password}"
   ssh_proxy_host = "${var.socks_proxy}"
 }
 
diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl
index 858b4873f..7f91b8c19 100644
--- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl
+++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl
@@ -24,6 +24,11 @@ variable "source_vm_name" {
   type = string
 }
 
+variable "source_vm_port" {
+  type = number
+  default = 22
+}
+
 variable "source_vm_tag" {
   type = string
   default = ""
@@ -90,8 +95,9 @@ source "veertu-anka-vm-clone" "template" {
 
 source "null" "template" {
   ssh_host = "${var.source_vm_name}"
+  ssh_port = "${var.source_vm_port}"
   ssh_username = "${var.vm_username}"
-  ssh_password = "${var.vm_password}"
+  ssh_private_key_file = "${var.vm_password}"
   ssh_proxy_host = "${var.socks_proxy}"
 }
 
diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl
index ed93c149e..a772f7269 100644
--- a/images/macos/templates/macOS-14.anka.pkr.hcl
+++ b/images/macos/templates/macOS-14.anka.pkr.hcl
@@ -24,6 +24,11 @@ variable "source_vm_name" {
   type = string
 }
 
+variable "source_vm_port" {
+  type = number
+  default = 22
+}
+
 variable "source_vm_tag" {
   type = string
   default = ""
@@ -89,8 +94,9 @@ source "veertu-anka-vm-clone" "template" {
 
 source "null" "template" {
   ssh_host = "${var.source_vm_name}"
+  ssh_port = "${var.source_vm_port}"
   ssh_username = "${var.vm_username}"
-  ssh_password = "${var.vm_password}"
+  ssh_private_key_file = "${var.vm_password}"
   ssh_proxy_host = "${var.socks_proxy}"
 }
 
diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl
index 750b55387..65e4edbbc 100644
--- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl
+++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl
@@ -24,6 +24,11 @@ variable "source_vm_name" {
   type = string
 }
 
+variable "source_vm_port" {
+  type = number
+  default = 22
+}
+
 variable "source_vm_tag" {
   type = string
   default = ""
@@ -90,8 +95,9 @@ source "veertu-anka-vm-clone" "template" {
 
 source "null" "template" {
   ssh_host = "${var.source_vm_name}"
+  ssh_port = "${var.source_vm_port}"
   ssh_username = "${var.vm_username}"
-  ssh_password = "${var.vm_password}"
+  ssh_private_key_file = "${var.vm_password}"
   ssh_proxy_host = "${var.socks_proxy}"
 }