actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-20 06:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ssh legacy fix for Ubuntu Server 22.04 (#5645)

Browse Source
This commit is contained in:
Aleksandr Chebotov
2022-06-01 10:08:42 +02:00
committed by GitHub
parent 0fec5d8152
commit 36ddf7491f
3 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
images.CI/linux-and-win/build-image.ps1
View File

@@ -19,9 +19,6 @@ if (-not (Test-Path $TemplatePath))
exit 1 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]::GetFileName($TemplatePath).Split(".")[0] $Image = [io.path]::GetFileName($TemplatePath).Split(".")[0]
$TempResourceGroupName = "${ResourcesNamePrefix}_${Image}" $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}"
$InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper() $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper()

4
images/linux/scripts/base/configure-legacy-ssh.sh
View File

@@ -1,4 +0,0 @@
#!/bin/bash -e
# https://github.com/hashicorp/packer/issues/11656
echo PubkeyAcceptedKeyTypes=+ssh-rsa >> /etc/ssh/sshd_config
systemctl reload sshd.service

6
images/linux/ubuntu2204.pkr.hcl
View File

@@ -60,11 +60,6 @@ variable "image_os" {
default = "ubuntu22" default = "ubuntu22"
} }
variable "image_repository_path" {
type = string
default = "${env("IMAGEREPOSITORYPATH")}"
}
variable "image_version" { variable "image_version" {
type = string type = string
default = "dev" default = "dev"
@@ -165,7 +160,6 @@ source "azure-arm" "build_vhd" {
subscription_id = "${var.subscription_id}" subscription_id = "${var.subscription_id}"
temp_resource_group_name = "${var.temp_resource_group_name}" temp_resource_group_name = "${var.temp_resource_group_name}"
tenant_id = "${var.tenant_id}" tenant_id = "${var.tenant_id}"
user_data_file = "${var.image_repository_path}/images/linux/scripts/base/configure-legacy-ssh.sh"
virtual_network_name = "${var.virtual_network_name}" virtual_network_name = "${var.virtual_network_name}"
virtual_network_resource_group_name = "${var.virtual_network_resource_group_name}" virtual_network_resource_group_name = "${var.virtual_network_resource_group_name}"
virtual_network_subnet_name = "${var.virtual_network_subnet_name}" virtual_network_subnet_name = "${var.virtual_network_subnet_name}"