Update marketplace images to ubuntu 24.04 lts (#481)

* update marketplace images to ubuntu 22.04 lts

* fix azure build script

* fix azure again
This commit is contained in:
Kyle Spearrin
2026-03-31 15:31:58 -04:00
committed by GitHub
parent b61b666b0b
commit 36730f4e40
6 changed files with 12 additions and 12 deletions

View File

@@ -61,7 +61,7 @@ variable "github_run_id" {
locals { timestamp = regex_replace(timestamp(), "[- TZ:]", "") }
locals {
image_name = "bitwarden-22-04-${local.timestamp}"
image_name = "bitwarden-24-04-${local.timestamp}"
}
source "azure-arm" "bitwarden_self_host" {
@@ -70,8 +70,8 @@ source "azure-arm" "bitwarden_self_host" {
os_type = "Linux"
image_publisher = "Canonical"
image_offer = "0001-com-ubuntu-server-jammy"
image_sku = "22_04-lts-gen2"
image_offer = "ubuntu-24_04-lts"
image_sku = "server"
build_resource_group_name = var.resource_group
vm_size = "Standard_B2s"

View File

@@ -35,11 +35,11 @@ fi
echo -en "Distribution: ${OS}\n"
echo -en "Version: ${VER}\n\n"
if [[ $OS == "Ubuntu" ]] && [[ $VER == "22.04" ]]; then
if [[ $OS == "Ubuntu" ]] && [[ $VER == "24.04" ]]; then
echo -en "\e[32m[PASS]\e[0m Supported OS detected: ${OS} ${VER}\n"
((PASS++))
else
echo -en "\e[41m[FAIL]\e[0m ${OS} ${VER} is not the expected OS (Ubuntu 22.04)\n"
echo -en "\e[41m[FAIL]\e[0m ${OS} ${VER} is not the expected OS (Ubuntu 24.04)\n"
((FAIL++))
STATUS=2
fi