Skip to content

Commit

Permalink
Merge pull request #271 from akerouanton/ubuntu2304
Browse files Browse the repository at this point in the history 
Add ubuntu2304...
  • Loading branch information
@ladar
ladar authored Aug 31, 2023
2 parents 1860fd9 + e5cd82a commit 70fb75e
Show file tree
Hide file tree
Showing 24 changed files with 1,475 additions and 2 deletions.
3 changes: 1 addition & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ https://quay.io/organization/lavabit

FreeBSD 13.2
Fedora 38
Ubuntu 23.04 (Lunar Lobster)
OpenBSD 7.3

## Upcoming Additions
Expand Down Expand Up @@ -97,7 +96,7 @@ git clone https://github.com/lavabit/robox && cd robox

You will to replace the BOX and PROVIDER placeholders in the example above.

Replace `BOX` with one of the these values: `[alma8|alma9|alpine35|alpine36|alpine37|alpine38|alpine39|alpine310|alpine311|alpine312|alpine313|alpine314|alpine315|alpine316|alpine317|arch|centos6|centos7|centos8|centos8s|centos9s|debian8|debian9|debian10|debian11|devuan1|devuan2|devuan3|devuan4|dragonflybsd5|dragonflybsd6|fedora25|fedora26|fedora27|fedora28|fedora29|fedora30|fedora31|fedora32|fedora33|fedora34|fedora35|fedora36|fedora37|freebsd11|freebsd12|freebsd13|gentoo|hardenedbsd11|hardenedbsd12|hardenedbsd13|netbsd8|netbsd9|openbsd6|openbsd7|opensuse15|opensuse42|oracle7|oracle8|oracle8|rhel6|rhel7|rhel8|rocky8|rocky9|ubuntu1604|ubuntu1610|ubuntu1704|ubuntu1710|ubuntu1804|ubuntu1810|ubuntu1904|ubuntu1910|ubuntu2004|ubuntu2010|ubuntu2104|ubuntu2110|ubuntu2204|ubuntu2210]`
Replace `BOX` with one of the these values: `[alma8|alma9|alpine35|alpine36|alpine37|alpine38|alpine39|alpine310|alpine311|alpine312|alpine313|alpine314|alpine315|alpine316|alpine317|arch|centos6|centos7|centos8|centos8s|centos9s|debian8|debian9|debian10|debian11|devuan1|devuan2|devuan3|devuan4|dragonflybsd5|dragonflybsd6|fedora25|fedora26|fedora27|fedora28|fedora29|fedora30|fedora31|fedora32|fedora33|fedora34|fedora35|fedora36|fedora37|freebsd11|freebsd12|freebsd13|gentoo|hardenedbsd11|hardenedbsd12|hardenedbsd13|netbsd8|netbsd9|openbsd6|openbsd7|opensuse15|opensuse42|oracle7|oracle8|oracle8|rhel6|rhel7|rhel8|rocky8|rocky9|ubuntu1604|ubuntu1610|ubuntu1704|ubuntu1710|ubuntu1804|ubuntu1810|ubuntu1904|ubuntu1910|ubuntu2004|ubuntu2010|ubuntu2104|ubuntu2110|ubuntu2204|ubuntu2210|ubuntu2304]`

And replace `PROVIDER` with one of these values: `[docker|hyperv|libvirt|parallels|virtualbox|vmware]`.

Expand Down
50 changes: 50 additions & 0 deletions check/ubuntu2304.tpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

Vagrant.configure(2) do |config|

config.vm.box = "generic/ubuntu2304"

config.ssh.forward_x11 = true
config.ssh.forward_agent = true
config.vm.network :private_network, :auto_config => false, :autostart => false, :libvirt__network_name => "vagrant-libvirt", :libvirt__always_destroy => false

config.vm.provider :libvirt do |v, override|
v.qemu_use_session = false
v.video_vram = 256
v.memory = 2048
v.cpus = 2
v.management_network_name = "vagrant-libvirt"
v.management_network_keep = true
v.management_network_autostart = false
end

config.vm.provider :hyperv do |v, override|
v.maxmemory = 2048
v.memory = 2048
v.cpus = 2
end

config.vm.provider :virtualbox do |v, override|
v.gui = false
v.customize ["modifyvm", :id, "--memory", 2048]
v.customize ["modifyvm", :id, "--cpus", 2]
end

["vmware_fusion", "vmware_workstation", "vmware_desktop"].each do |provider|
config.vm.provider provider do |v, override|
v.gui = false
v.vmx["memsize"] = "2048"
v.vmx["numvcpus"] = "2"
v.vmx["cpuid.coresPerSocket"] = "1"
end
end

config.vm.provision "shell", inline: <<-SHELL
sudo sed -i 's/.*X11Forwarding.*/X11Forwarding yes/g' /etc/ssh/sshd_config
sudo sed -i 's/.*X11UseLocalhost.*/X11UseLocalhost no/g' /etc/ssh/sshd_config
sudo sed -i 's/.*X11DisplayOffset.*/X11DisplayOffset 10/g' /etc/ssh/sshd_config
sudo systemctl reload ssh.service
SHELL

end
74 changes: 74 additions & 0 deletions generic-hyperv.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3027,6 +3027,42 @@
"generic-alpine317-hyperv"
]
},
{
"type": "shell",
"timeout": "120m",
"scripts": [
"scripts/ubuntu2304/apt.sh",
"scripts/ubuntu2304/floppy.sh",
"scripts/ubuntu2304/fixkvp.sh",
"scripts/ubuntu2304/network.sh"
],
"start_retry_timeout": "15m",
"expect_disconnect": "true",
"only": [
"generic-ubuntu2304-hyperv"
]
},
{
"type": "shell",
"timeout": "120m",
"scripts": [
"scripts/ubuntu2304/vagrant.sh",
"scripts/ubuntu2304/profile.sh",
"scripts/ubuntu2304/motd.sh",
"scripts/ubuntu2304/fixtty.sh",
"scripts/ubuntu2304/virtualbox.sh",
"scripts/ubuntu2304/parallels.sh",
"scripts/ubuntu2304/vmware.sh",
"scripts/ubuntu2304/qemu.sh",
"scripts/ubuntu2304/cleanup.sh"
],
"pause_before": "120s",
"start_retry_timeout": "15m",
"expect_disconnect": "true",
"only": [
"generic-ubuntu2304-hyperv"
]
},
{
"type": "shell",
"timeout": "120m",
Expand Down Expand Up @@ -6463,6 +6499,44 @@
"enable_dynamic_memory": false,
"guest_additions_mode": "disable",
"enable_virtualization_extensions": false
},
{
"type": "hyperv-iso",
"name": "generic-ubuntu2304-hyperv",
"vm_name": "generic-ubuntu2304-hyperv",
"temp_path": "output/",
"output_directory": "output/generic-ubuntu2304-hyperv",
"boot_wait": "10s",
"boot_keygroup_interval": "1s",
"boot_command": [
"<tab><wait10>",
"c<wait10>",
"set gfxpayload=keep<enter><wait10>",
"linux /casper/vmlinuz autoinstall quiet net.ifnames=0 biosdevname=0 ",
"ds=\"nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/generic.ubuntu2304.vagrant\" --- <enter><wait10>",
"initrd /casper/initrd<enter><wait10>",
"boot<enter>"
],
"disk_size": 131072,
"memory": 2048,
"cpus": 2,
"http_directory": "http",
"iso_url": "https://releases.ubuntu.com/23.04/ubuntu-23.04-live-server-amd64.iso",
"iso_checksum": "sha256:c7cda48494a6d7d9665964388a3fc9c824b3bef0c9ea3818a1be982bc80d346b",
"ssh_username": "root",
"ssh_password": "vagrant",
"ssh_port": 22,
"ssh_timeout": "7200s",
"shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now",
"generation": 1,
"headless": true,
"communicator": "ssh",
"skip_compaction": false,
"enable_secure_boot": false,
"enable_mac_spoofing": false,
"enable_dynamic_memory": false,
"guest_additions_mode": "disable",
"enable_virtualization_extensions": false
}
],
"post-processors": [
Expand Down
75 changes: 75 additions & 0 deletions generic-libvirt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3027,6 +3027,42 @@
"generic-alpine317-libvirt"
]
},
{
"type": "shell",
"timeout": "120m",
"scripts": [
"scripts/ubuntu2304/apt.sh",
"scripts/ubuntu2304/floppy.sh",
"scripts/ubuntu2304/fixkvp.sh",
"scripts/ubuntu2304/network.sh"
],
"start_retry_timeout": "15m",
"expect_disconnect": "true",
"only": [
"generic-ubuntu2304-libvirt"
]
},
{
"type": "shell",
"timeout": "120m",
"scripts": [
"scripts/ubuntu2304/vagrant.sh",
"scripts/ubuntu2304/profile.sh",
"scripts/ubuntu2304/motd.sh",
"scripts/ubuntu2304/fixtty.sh",
"scripts/ubuntu2304/virtualbox.sh",
"scripts/ubuntu2304/parallels.sh",
"scripts/ubuntu2304/vmware.sh",
"scripts/ubuntu2304/qemu.sh",
"scripts/ubuntu2304/cleanup.sh"
],
"pause_before": "120s",
"start_retry_timeout": "15m",
"expect_disconnect": "true",
"only": [
"generic-ubuntu2304-libvirt"
]
},
{
"scripts": [
"scripts/common/motd.sh",
Expand Down Expand Up @@ -6459,6 +6495,45 @@
"ssh_port": 22,
"ssh_timeout": "3600s",
"shutdown_command": "/sbin/poweroff"
},
{
"type": "qemu",
"name": "generic-ubuntu2304-libvirt",
"vm_name": "generic-ubuntu2304-libvirt",
"output_directory": "output/generic-ubuntu2304-libvirt",
"qemu_binary": "qemu-system-x86_64",
"boot_wait": "10s",
"boot_keygroup_interval": "1s",
"boot_command": [
"<tab><wait10>",
"c<wait10>",
"set gfxpayload=keep<enter><wait10>",
"linux /casper/vmlinuz autoinstall quiet net.ifnames=0 biosdevname=0 ",
"ds=\"nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/generic.ubuntu2304.vagrant\" --- <enter><wait10>",
"initrd /casper/initrd<enter><wait10>",
"boot<enter>"
],
"format": "qcow2",
"disk_size": "131072",
"disk_discard": "unmap",
"disk_detect_zeroes": "on",
"disk_cache": "unsafe",
"disk_image": false,
"disk_compression": true,
"disk_interface": "virtio-scsi",
"net_device": "virtio-net",
"cpus": 2,
"memory": 2048,
"http_directory": "http",
"headless": true,
"iso_url": "https://releases.ubuntu.com/23.04/ubuntu-23.04-live-server-amd64.iso",
"iso_checksum": "sha256:c7cda48494a6d7d9665964388a3fc9c824b3bef0c9ea3818a1be982bc80d346b",
"ssh_username": "root",
"ssh_password": "vagrant",
"ssh_port": 22,
"ssh_timeout": "3600s",
"ssh_handshake_attempts": "10000",
"shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now"
}
],
"post-processors": [
Expand Down
103 changes: 103 additions & 0 deletions generic-parallels.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3019,6 +3019,42 @@
"generic-alpine317-parallels"
]
},
{
"type": "shell",
"timeout": "120m",
"scripts": [
"scripts/ubuntu2304/apt.sh",
"scripts/ubuntu2304/floppy.sh",
"scripts/ubuntu2304/fixkvp.sh",
"scripts/ubuntu2304/network.sh"
],
"start_retry_timeout": "45m",
"expect_disconnect": "true",
"only": [
"generic-ubuntu2304-parallels"
]
},
{
"type": "shell",
"timeout": "120m",
"scripts": [
"scripts/ubuntu2304/vagrant.sh",
"scripts/ubuntu2304/profile.sh",
"scripts/ubuntu2304/motd.sh",
"scripts/ubuntu2304/fixtty.sh",
"scripts/ubuntu2304/virtualbox.sh",
"scripts/ubuntu2304/parallels.sh",
"scripts/ubuntu2304/vmware.sh",
"scripts/ubuntu2304/qemu.sh",
"scripts/ubuntu2304/cleanup.sh"
],
"pause_before": "120s",
"start_retry_timeout": "45m",
"expect_disconnect": "true",
"only": [
"generic-ubuntu2304-parallels"
]
},
{
"scripts": [
"scripts/common/motd.sh",
Expand Down Expand Up @@ -8823,6 +8859,73 @@
"parallels_tools_mode": "upload",
"parallels_tools_guest_path": "/root/parallels-tools-linux.iso",
"prlctl_version_file": "/root/parallels-tools-version.txt"
},
{
"type": "parallels-iso",
"name": "generic-ubuntu2304-parallels",
"vm_name": "generic-ubuntu2304-parallels",
"output_directory": "output/generic-ubuntu2304-parallels",
"boot_wait": "10s",
"boot_keygroup_interval": "1s",
"boot_command": [
"<tab><wait10>",
"c<wait10>",
"set gfxpayload=keep<enter><wait10>",
"linux /casper/vmlinuz autoinstall quiet net.ifnames=0 biosdevname=0 ",
"ds=\"nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/generic.ubuntu2304.vagrant\" --- <enter><wait10>",
"initrd /casper/initrd<enter><wait10>",
"boot<enter>"
],
"disk_size": 32768,
"cpus": 2,
"memory": 2048,
"prlctl": [
[
"set",
"{{.Name}}",
"--adaptive-hypervisor",
"on"
],
[
"set",
"{{.Name}}",
"--3d-accelerate",
"off"
],
[
"set",
"{{.Name}}",
"--videosize",
"16"
],
[
"set",
"{{.Name}}",
"--pmu-virt",
"on"
],
[
"set",
"{{.Name}}",
"--faster-vm",
"on"
]
],
"hard_drive_interface": "ide",
"guest_os_type": "ubuntu",
"skip_compaction": false,
"http_directory": "http",
"iso_url": "https://releases.ubuntu.com/23.04/ubuntu-23.04-live-server-amd64.iso",
"iso_checksum": "sha256:c7cda48494a6d7d9665964388a3fc9c824b3bef0c9ea3818a1be982bc80d346b",
"ssh_username": "root",
"ssh_password": "vagrant",
"ssh_port": 22,
"ssh_timeout": "3600s",
"shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now",
"parallels_tools_flavor": "lin",
"parallels_tools_mode": "upload",
"parallels_tools_guest_path": "/root/parallels-tools-linux.iso",
"prlctl_version_file": "/root/parallels-tools-version.txt"
}
],
"post-processors": [
Expand Down
Loading

0 comments on commit 70fb75e

Please sign in to comment.