Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add images for Ubuntu 24.04 LTS - Desktop #440

Merged
merged 2 commits into from
May 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .azure-pipelines/ubuntu-desktop/2404-lts-ubuntu/hyperv.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
trigger: none
pr: none

stages:
- template: ../../stages.yml
parameters:
sample: ubuntu-desktop
image: 2404-lts-ubuntu
provider: hyperv
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
trigger: none
pr: none

stages:
- template: ../../stages.yml
parameters:
sample: ubuntu-desktop
image: 2404-lts-ubuntu
provider: virtualbox
9 changes: 9 additions & 0 deletions .azure-pipelines/ubuntu-desktop/2404-lts-ubuntu/vmware.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
trigger: none
pr: none

stages:
- template: ../../stages.yml
parameters:
sample: ubuntu-desktop
image: 2404-lts-ubuntu
provider: vmware
9 changes: 9 additions & 0 deletions .azure-pipelines/ubuntu-desktop/2404-lts-xubuntu/hyperv.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
trigger: none
pr: none

stages:
- template: ../../stages.yml
parameters:
sample: ubuntu-desktop
image: 2404-lts-xubuntu
provider: hyperv
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
trigger: none
pr: none

stages:
- template: ../../stages.yml
parameters:
sample: ubuntu-desktop
image: 2404-lts-xubuntu
provider: virtualbox
9 changes: 9 additions & 0 deletions .azure-pipelines/ubuntu-desktop/2404-lts-xubuntu/vmware.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
trigger: none
pr: none

stages:
- template: ../../stages.yml
parameters:
sample: ubuntu-desktop
image: 2404-lts-xubuntu
provider: vmware
1 change: 0 additions & 1 deletion build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ void PackerInit() {
var arguments = new ProcessArgumentBuilder();

arguments.Append("init");
arguments.Append("-upgrade");
arguments.Append(platformDirectory);

Packer(arguments);
Expand Down
28 changes: 28 additions & 0 deletions samples/ubuntu-desktop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,39 @@ This folder contains Packer templates for building `Ubuntu Desktop` images.

See the links below for the details of the available images:

- [24.04 LTS Ubuntu](#2404-lts-ubuntu)
- [24.04 LTS Xubuntu](#2404-lts-xubuntu)
- [22.04 LTS Ubuntu](#2204-lts-ubuntu)
- [22.04 LTS Xubuntu](#2204-lts-xubuntu)
- [20.04 LTS Ubuntu](#2004-lts-ubuntu)
- [20.04 LTS Xubuntu](#2004-lts-xubuntu)

## 24.04 LTS Ubuntu

[Vagrant box](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-desktop-2404-lts)

The template has the following settings:

- **Ubuntu Desktop 24.04 LTS**
- OpenSSH Server
- **Vagrant**
- User `vagrant` with password `vagrant` and Vagrant's insecure key
- 2 vCPUs
- 4 GB RAM

## 24.04 LTS Xubuntu

[Vagrant box](https://app.vagrantup.com/gusztavvargadr/boxes/xubuntu-desktop-2404-lts)

The template has the following settings:

- **Xubuntu Desktop 24.04 LTS**
- OpenSSH Server
- **Vagrant**
- User `vagrant` with password `vagrant` and Vagrant's insecure key
- 2 vCPUs
- 4 GB RAM

## 22.04 LTS Ubuntu

[Vagrant box](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-desktop-2204-lts) | [Vagrant alias](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-desktop)
Expand Down
2 changes: 2 additions & 0 deletions samples/ubuntu-desktop/Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
load "#{File.dirname(__FILE__)}/../core.Vagrantfile"

Vagrant.configure("2") do |config|
config_vm_define config, "2404-lts-ubuntu", "ubuntu-desktop-2404-lts"
config_vm_define config, "2404-lts-xubuntu", "xubuntu-desktop-2404-lts"
config_vm_define config, "2204-lts-ubuntu", "ubuntu-desktop-2204-lts"
config_vm_define config, "2204-lts-ubuntu-alias", "ubuntu-desktop"
config_vm_define config, "2204-lts-xubuntu", "xubuntu-desktop-2204-lts"
Expand Down
60 changes: 60 additions & 0 deletions samples/ubuntu-desktop/images.pkrvars.hcl
Original file line number Diff line number Diff line change
@@ -1,4 +1,64 @@
images = {
"2404-lts-ubuntu" = {
core = {
image_name = "ubuntu-desktop/2404-lts-ubuntu"
image_description = "Ubuntu Desktop 24.04 LTS"
image_version = "2404.0"
}

native = {
source_iso_url_local = "ubuntu-24.04-desktop-amd64.iso"
source_iso_url_remote = "https://releases.ubuntu.com/noble/ubuntu-24.04-desktop-amd64.iso"
source_iso_checksum = "sha256:81fae9cc21e2b1e3a9a4526c7dad3131b668e346c580702235ad4d02645d9455"

chef_attributes = "ubuntu"
}

vagrant = {
memory = "4096"
ports = "3389"
box_name = "ubuntu-desktop-2404-lts"
}

virtualbox = {
guest_os_type = "Ubuntu_64"
}

vmware = {
guest_os_type = "ubuntu-64"
}
}

"2404-lts-xubuntu" = {
core = {
image_name = "ubuntu-desktop/2404-lts-xubuntu"
image_description = "Xubuntu Desktop 24.04 LTS"
image_version = "2404.0"
}

native = {
source_iso_url_local = "xubuntu-24.04-desktop-amd64.iso"
source_iso_url_remote = "https://nl.archive.ubuntu.com/ubuntu-cdimage-xubuntu/releases/24.04/release/xubuntu-24.04-desktop-amd64.iso"
source_iso_checksum = "sha256:8c47b15c4089473bcc58e369a472cabf83d137c7bf8ad7d9465ad086e7bd5272"

chef_attributes = "xubuntu"
}

vagrant = {
memory = "4096"
ports = "3389"
box_name = "xubuntu-desktop-2404-lts"
}

virtualbox = {
guest_os_type = "Ubuntu_64"
}

vmware = {
guest_os_type = "ubuntu-64"
}
}

"2204-lts-ubuntu" = {
core = {
image_name = "ubuntu-desktop/2204-lts-ubuntu"
Expand Down
3 changes: 3 additions & 0 deletions src/ubuntu/chef/initialize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

set -euo pipefail

sudo apt-get update -y
sudo apt-get install -y curl

mkdir -p /var/tmp/packer-build/chef

if ! [ -x "$(command -v chef-client)" ]; then
Expand Down