diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1 index 1ea82791c..41d03190d 100644 --- a/images.CI/linux-and-win/build-image.ps1 +++ b/images.CI/linux-and-win/build-image.ps1 @@ -19,6 +19,9 @@ if (-not (Test-Path $TemplatePath)) exit 1 } +# Set Image repository path env variable, this is a workaround for Ubuntu 22.04 until this is fixed https://github.com/hashicorp/packer/issues/11733 +$env:ImageRepositoryPath = "." + $Image = [io.path]::GetFileNameWithoutExtension($TemplatePath) $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() diff --git a/images/linux/ubuntu2204.json b/images/linux/ubuntu2204.json index f5479e218..518eb059a 100644 --- a/images/linux/ubuntu2204.json +++ b/images/linux/ubuntu2204.json @@ -14,6 +14,7 @@ "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", + "image_repository_path": "{{env `IMAGEREPOSITORYPATH`}}", "image_folder": "/imagegeneration", "imagedata_file": "/imagegeneration/imagedata.json", "installer_script_folder": "/imagegeneration/installers", @@ -49,7 +50,7 @@ "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", - "user_data_file": "./images/linux/scripts/base/configure-legacy-ssh.sh", + "user_data_file": "{{user `image_repository_path`}}/images/linux/scripts/base/configure-legacy-ssh.sh", "os_type": "Linux", "image_publisher": "canonical", "image_offer": "0001-com-ubuntu-server-jammy",