gusztavvargadr · gusztavvargadr · Jun 9, 2024 · Jun 8, 2024 · Jun 9, 2024 · Jun 9, 2024
diff --git a/.azure-pipelines/docker-linux/community-ubuntu-server/hyperv.yml b/.azure-pipelines/docker-linux/community-ubuntu-server/hyperv.yml
@@ -4,7 +4,7 @@ pr: none
 resources:
   pipelines:
     - pipeline: source
-      source: ubuntu-server.2204-lts.hyperv
+      source: ubuntu-server.2404-lts.hyperv
 
 stages:
   - template: ../../stages.yml

diff --git a/.azure-pipelines/docker-linux/community-ubuntu-server/virtualbox.yml b/.azure-pipelines/docker-linux/community-ubuntu-server/virtualbox.yml
@@ -4,7 +4,7 @@ pr: none
 resources:
   pipelines:
     - pipeline: source
-      source: ubuntu-server.2204-lts.virtualbox
+      source: ubuntu-server.2404-lts.virtualbox
 
 stages:
   - template: ../../stages.yml

diff --git a/.azure-pipelines/docker-linux/community-ubuntu-server/vmware.yml b/.azure-pipelines/docker-linux/community-ubuntu-server/vmware.yml
@@ -4,7 +4,7 @@ pr: none
 resources:
   pipelines:
     - pipeline: source
-      source: ubuntu-server.2204-lts.vmware
+      source: ubuntu-server.2404-lts.vmware
 
 stages:
   - template: ../../stages.yml

diff --git a/build.cake b/build.cake
@@ -2,7 +2,7 @@ var configuration = Argument("configuration", string.Empty);
 var target = Argument("target", "default");
 
 var author = Argument("author", "gusztavvargadr");
-var version = Argument("version", "2404");
+var version = Argument("version", "2405");
 
 var configurationParts = configuration.Split('/', StringSplitOptions.RemoveEmptyEntries);
 var sample = configurationParts.ElementAtOrDefault(0) ?? Argument<string>("sample");

diff --git a/lib/gusztavvargadr/chef b/lib/gusztavvargadr/chef
diff --git a/samples/docker-linux/README.md b/samples/docker-linux/README.md
@@ -14,5 +14,5 @@ See the links below for the details of the available images:
 
 The template has the following settings:
 
-- [**Ubuntu Server 22.04 LTS**](../ubuntu-server/README.md#2204-lts)
+- [**Ubuntu Server 24.04 LTS**](../ubuntu-server/README.md#2404-lts)
 - [**Docker Engine**](https://docs.docker.com/engine/)
diff --git a/samples/docker-linux/images.pkrvars.hcl b/samples/docker-linux/images.pkrvars.hcl
@@ -2,11 +2,11 @@ images = {
   "community-ubuntu-server" = {
     core = {
       image_description = "Docker Community on Ubuntu Server"
-      image_version     = "2600.2204"
+      image_version     = "2600.2404"
     }
 
     native = {
-      source_image = "ubuntu-server/2204-lts"
+      source_image = "ubuntu-server/2404-lts"
     }
 
     vagrant = {

diff --git a/samples/ubuntu-desktop/README.md b/samples/ubuntu-desktop/README.md
@@ -15,7 +15,7 @@ See the links below for the details of the available images:
 
 ## 24.04 LTS Ubuntu
 
-[Vagrant box](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-desktop-2404-lts)  
+[Vagrant box](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-desktop-2404-lts) | [Vagrant alias](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-desktop)  
 
 The template has the following settings:
 
@@ -41,7 +41,7 @@ The template has the following settings:
 
 ## 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)  
+[Vagrant box](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-desktop-2204-lts)  
 
 The template has the following settings:
 

diff --git a/samples/ubuntu-desktop/Vagrantfile b/samples/ubuntu-desktop/Vagrantfile
@@ -2,9 +2,9 @@ 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-ubuntu-alias", "ubuntu-desktop"
   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"
   config_vm_define config, "2004-lts-ubuntu", "ubuntu-desktop-2004-lts"
   config_vm_define config, "2004-lts-xubuntu", "ubuntu-desktop-2004-lts-xfce"

diff --git a/samples/ubuntu-desktop/images.pkrvars.hcl b/samples/ubuntu-desktop/images.pkrvars.hcl
@@ -18,6 +18,7 @@ images = {
       memory    = "4096"
       ports     = "3389"
       box_name  = "ubuntu-desktop-2404-lts"
+      box_alias = "ubuntu-desktop"
     }
 
     virtualbox = {
@@ -38,7 +39,7 @@ images = {
 
     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_url_remote = "https://cdimage.ubuntu.com/xubuntu/releases/24.04/release/xubuntu-24.04-desktop-amd64.iso"
       source_iso_checksum   = "sha256:8c47b15c4089473bcc58e369a472cabf83d137c7bf8ad7d9465ad086e7bd5272"
 
       chef_attributes = "xubuntu"
@@ -76,7 +77,6 @@ images = {
       memory    = "4096"
       ports     = "3389"
       box_name  = "ubuntu-desktop-2204-lts"
-      box_alias = "ubuntu-desktop"
     }
   }
 

diff --git a/samples/ubuntu-server/README.md b/samples/ubuntu-server/README.md
@@ -12,7 +12,7 @@ See the links below for the details of the available images:
 
 ## 24.04 LTS
 
-[Vagrant box](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-server-2404-lts)  
+[Vagrant box](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-server-2404-lts) | [Vagrant alias](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-server)  
 
 The template has the following settings:
 
@@ -25,7 +25,7 @@ The template has the following settings:
 
 ## 22.04 LTS
 
-[Vagrant box](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-server-2204-lts) | [Vagrant alias](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-server)  
+[Vagrant box](https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-server-2204-lts)  
 
 The template has the following settings:
 

diff --git a/samples/ubuntu-server/Vagrantfile b/samples/ubuntu-server/Vagrantfile
@@ -2,8 +2,8 @@ load "#{File.dirname(__FILE__)}/../core.Vagrantfile"
 
 Vagrant.configure("2") do |config|
   config_vm_define config, "2404-lts", "ubuntu-server-2404-lts"
+  config_vm_define config, "2404-lts-alias", "ubuntu-server"
   config_vm_define config, "2204-lts", "ubuntu-server-2204-lts"
-  config_vm_define config, "2204-lts-alias", "ubuntu-server"
   config_vm_define config, "2004-lts", "ubuntu-server-2004-lts"
 
   config.vm.provision "shell", inline: <<-EOH

diff --git a/samples/ubuntu-server/images.pkrvars.hcl b/samples/ubuntu-server/images.pkrvars.hcl
@@ -7,10 +7,14 @@ images = {
 
     native = {
       source_iso_url_local  = "ubuntu-24.04-live-server-amd64.iso"
-      source_iso_url_remote = "https://releases.ubuntu.com/24.04/ubuntu-24.04-live-server-amd64.iso"
+      source_iso_url_remote = "https://app.vagrantup.com/gusztavvargadr-iso/boxes/ubuntu-server/versions/2404.0.2404/providers/iso/amd64/vagrant.box"
       source_iso_checksum   = "sha256:8762f7e74e4d64d72fceb5f70682e6b069932deedb4949c6975d0f0fe0a91be3"
     }
 
+    vagrant = {
+      box_alias = "ubuntu-server"
+    }
+
     virtualbox = {
       guest_os_type = "Ubuntu_64"
     }
@@ -20,7 +24,6 @@ images = {
     }
   }
 
-
   "2204-lts" = {
     core = {
       image_description = "Ubuntu Server 22.04 LTS"
@@ -33,10 +36,6 @@ images = {
       source_iso_checksum   = "sha256:a4acfda10b18da50e2ec50ccaf860d7f20b389df8765611142305c0e911d16fd"
     }
 
-    vagrant = {
-      box_alias = "ubuntu-server"
-    }
-
     virtualbox = {
       guest_os_type = "Ubuntu_64"
     }

diff --git a/src/ubuntu/chef/cookbooks/gusztavvargadr_packer_ubuntu/recipes/initialize.rb b/src/ubuntu/chef/cookbooks/gusztavvargadr_packer_ubuntu/recipes/initialize.rb
@@ -5,7 +5,7 @@
 if vbox?
   vbox_version = (shell_out('VBoxControl -v').stdout rescue '').strip
 
-  unless vbox_version.include?('6.')
+  unless vbox_version.include?('6.') || vbox_version.include?('7.')
     apt_package [ 'build-essential', 'cryptsetup', 'libssl-dev', 'libreadline-dev', 'zlib1g-dev', 'linux-source', 'dkms', 'linux-headers-generic' ] do
       action :upgrade
       notifies :run, 'bash[guest-additions]', :immediately

diff --git a/src/windows/boot/autounattend-first-logon.ps1 b/src/windows/boot/autounattend-first-logon.ps1
@@ -3,7 +3,7 @@ $ProgressPreference = 'SilentlyContinue'
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
 Write-Host "Install Chocolatey"
-%{ for chocolatey_version in compact([lookup(boot, "boot_chocolatey_version", "2.2.2")]) ~}
+%{ for chocolatey_version in compact([lookup(boot, "boot_chocolatey_version", "2.3.0")]) ~}
 $env:chocolateyVersion = '${chocolatey_version}'
 %{ endfor ~}
 Set-ExecutionPolicy Bypass -Scope Process -Force; Invoke-WebRequest https://chocolatey.org/install.ps1 -UseBasicParsing | Invoke-Expression

diff --git a/src/windows/boot/autounattend.xml b/src/windows/boot/autounattend.xml
@@ -26,7 +26,7 @@
                     <CreatePartitions>
                         <CreatePartition wcm:action="add">
                             <Order>1</Order>
-                            <Size>1000</Size>
+                            <Size>500</Size>
                             <Type>Primary</Type>
                         </CreatePartition>
                         <CreatePartition wcm:action="add">

diff --git a/src/windows/chef/cookbooks/gusztavvargadr_packer_windows/recipes/initialize.rb b/src/windows/chef/cookbooks/gusztavvargadr_packer_windows/recipes/initialize.rb
@@ -75,7 +75,7 @@
 if vbox?
   vbox_version = (powershell_out('& "C:/Program Files/Oracle/VirtualBox Guest Additions/VBoxControl.exe" -v').stdout rescue '').strip
 
-  unless vbox_version.include?('6.')
+  unless vbox_version.include?('6.') || vbox_version.include?('7.')
     vbox_version = powershell_out('cat $env:HOME/.vbox_version').stdout.strip
     vbox_guest_additions_path = "#{Chef::Config['file_cache_path']}/VBoxGuestAdditions.iso"
     vbox_guest_additions_source = "https://download.virtualbox.org/virtualbox/#{vbox_version}/VBoxGuestAdditions_#{vbox_version}.iso"
+3 −0		.env.linux-ubuntu-24.04
+1 −1		build/chef/linux/chef-workstation.install.sh
+1 −1		build/chef/windows/chef-core.install.ps1
+1 −1		build/chef/windows/chef-workstation.install.ps1
+12 −0		build/docker/azure-pipelines.yml
+0 −18		samples/cookbooks/dotnet/attributes/options.rb
+0 −2		samples/cookbooks/dotnet/kitchen.yml
+4 −4		samples/cookbooks/dotnet/resources/tool_ubuntu.rb
+0 −1		samples/cookbooks/dotnet/test/integration/runtimes/tools.rb
+0 −1		samples/cookbooks/dotnet/test/integration/sdks/tools.rb
+1 −1		samples/cookbooks/hashicorp/resources/tool_ubuntu.rb
+4 −12		samples/cookbooks/iis/attributes/options.rb
+0 −1		samples/cookbooks/iis/test/integration/default/tools.rb
+1 −1		samples/cookbooks/virtualbox/attributes/options.rb
+2 −2		samples/cookbooks/vsts/attributes/options.rb
+0 −3		samples/policies/development-core-tools/Policyfile.rb
+4 −9		samples/policies/development-core-tools/Policyfile.yml