Update refererences and clean up cloud builds #61

Berksfile.core.rb

@@ -18,6 +18,8 @@ def gusztavvargadr_packer_sources
   gusztavvargadr_packer_cookbook 'de'
   gusztavvargadr_packer_cookbook 'vs17c'
   gusztavvargadr_packer_cookbook 'vs17p'
+  gusztavvargadr_packer_cookbook 'vs19c'
+  gusztavvargadr_packer_cookbook 'vs19p'
   gusztavvargadr_packer_cookbook 'iis'
   gusztavvargadr_packer_cookbook 'sql14d'
   gusztavvargadr_packer_cookbook 'sql17d'

README.md

@@ -2,7 +2,7 @@
 
 **Contents** [TL;DR] | [Overview] | [Getting started] | [Usage] | [Next steps] | [Contributing] | [Resources]  
 
-This repository contains common [Packer] helper tools and sample templates for [Docker], [IIS], [SQL Server] and [Visual Studio] on [Windows] and [Ubuntu], building virtual machine images and [Vagrant] boxes for [VirtualBox], [Hyper-V] and [AWS], provisioned with [Chef].
+This repository contains common [Packer] helper tools and sample templates for [Visual Studio], [Docker], [IIS] and [SQL Server] on [Windows] and [Ubuntu], building virtual machine images and [Vagrant] boxes for [VirtualBox], [Hyper-V], Azure and [AWS], provisioned with [Chef].
 
 ## TL;DR
 
@@ -21,10 +21,10 @@ This repository contains common [Packer] helper tools and sample templates for [
 This repository contains [Packer] sample template for the following virtualization scenarios:
 
 - [Operating systems] for generic experiments with [Windows] and [Ubuntu].
-- [Hosting] using [Docker], [IIS] and [SQL Server].
 - [Development] using [Visual Studio].
+- [Hosting] using [Docker], [IIS] and [SQL Server].
 
-The virtual machine images and [Vagrant] boxes are built for [VirtualBox], [Hyper-V] - supporting [nested virtualization] - and [AWS], and are provisioned using [Chef].
+The virtual machine images and [Vagrant] boxes are built for [VirtualBox], [Hyper-V] - supporting [nested virtualization] -, Azure and [AWS], and are provisioned using [Chef].
 
 > **Note** All the components, including the core operating systems, share the following characteristics:
 > 
@@ -65,14 +65,28 @@ The following Vagrant boxes can be used for generic experiments on the respectiv
 
 #### Ubuntu
 
-- [**Ubuntu Desktop 1604**][ubuntu-desktop]
-- [**Ubuntu Server 1604**][ubuntu-server]
+- [**Ubuntu Desktop 1604 LTS**][ubuntu-desktop]
+- [**Ubuntu Server 1604 LTS**][ubuntu-server]
 
 [Ubuntu]: #ubuntu
 
 [ubuntu-desktop]: https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-desktop/
 [ubuntu-server]: https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-server/
 
+### Development
+
+The following Vagrant boxes can be used for development scenarios including setting up [virtual workstations]. They contain the respective development tools with the common configuration and are based on the core [operating systems].
+
+[Development]: #development
+
+#### Visual Studio
+
+- [**Visual Studio 2019 and 2017 Community** on Windows 10 Version 1809 Enterprise and Windows Server 2019 Standard][box-visual-studio]
+
+[Visual Studio]: #visual-studio
+
+[box-visual-studio]: https://app.vagrantup.com/gusztavvargadr/boxes/visual-studio/
+
 ### Hosting
 
 The following Vagrant boxes can be used for hosting scenarios. They contain the respective hosting tools with the default configuration are based on the core [operating systems].
@@ -82,7 +96,7 @@ The following Vagrant boxes can be used for hosting scenarios. They contain the
 #### Docker
 
 - [**Docker 1809 Enterprise** on Windows Server 2019 Standard Core][docker-windows]
-- [**Docker 1809 Community** on Ubuntu Server 1604][docker-linux]
+- [**Docker 1809 Community** on Ubuntu Server 1604 LTS][docker-linux]
 
 [Docker]: #docker
 
@@ -105,20 +119,6 @@ The following Vagrant boxes can be used for hosting scenarios. They contain the
 
 [box-sql-server]: https://app.vagrantup.com/gusztavvargadr/boxes/sql-server/
 
-### Development
-
-The following Vagrant boxes can be used for development scenarios including setting up [virtual workstations]. They contain the respective development tools with the common configuration and are based on the core [operating systems].
-
-[Development]: #development
-
-#### Visual Studio
-
-- [**Visual Studio 2017 Community and Professional** on Windows Server 2019 Standard and Windows 10 Version 1809 Enterprise][box-visual-studio]
-
-[Visual Studio]: #visual-studio
-
-[box-visual-studio]: https://app.vagrantup.com/gusztavvargadr/boxes/visual-studio/
-
 ## Getting started
 
 > **Note** The rest of this document covers the details of building virtual machine images and Vagrant boxes, and assumes that you are familiar with the basics of [Packer]. If that's not the case, it's recommended that you take a quick look at its [getting started guide][PackerGettingStarted].  

Vagrantfile

@@ -15,81 +15,74 @@ VagrantMachine.defaults_include(
   }
 )
 
-VagrantProvider.defaults_include(
+VagrantVirtualBoxProvider.defaults_include(
+  'memory' => 4096,
+  'cpus' => 2
+)
+
+VagrantHyperVProvider.defaults_include(
   'memory' => 4096,
   'cpus' => 2
 )
 
 def version
-  '1901.0.0'
+  '1905'
 end
 
 VagrantDeployment.configure(directory, 'stack' => 'packer') do |deployment|
-  # windows-10
-  create_packer_windows_vms(deployment, 'w10e')
+  create_packer_vms(deployment, 'w10e', 'windows-10', "1809.0.#{version}-enterprise")
 
-  # windows-server
-  create_packer_windows_vms(deployment, 'ws2019s')
-  create_packer_windows_vms(deployment, 'ws2019sc')
+  create_packer_vms(deployment, 'ws2019s', 'windows-server', "1809.0.#{version}-standard")
+  create_packer_vms(deployment, 'ws2019sc', 'windows-server', "1809.0.#{version}-standard-core")
 
-  # ubuntu-desktop
-  create_packer_linux_vms(deployment, 'u16d')
+  create_packer_vms(deployment, 'u16d', 'ubuntu-desktop', "1604.0.#{version}-lts")
 
-  # ubuntu-server
-  create_packer_linux_vms(deployment, 'u16s')
+  create_packer_vms(deployment, 'u16s', 'ubuntu-server', "1604.0.#{version}-lts")
 
-  # docker-windows
-  create_packer_windows_vms(deployment, 'ws2019sc-de')
+  create_packer_vms(deployment, 'ws2019sc-de', 'docker-windows', "1809.0.#{version}-enterprise-windows-server-1809-standard-core")
 
-  # docker-linux
-  create_packer_linux_vms(deployment, 'u16s-dc')
+  create_packer_vms(deployment, 'u16s-dc', 'docker-linux', "1809.0.#{version}-community-ubuntu-server-1604-lts")
 
-  # iis
-  create_packer_windows_vms(deployment, 'ws2019s-iis')
+  create_packer_vms(deployment, 'ws2019s-iis', 'iis', "10.0.#{version}-windows-server-1809-standard")
 
-  # sql-server
-  create_packer_windows_vms(deployment, 'ws2019s-sql17d')
+  create_packer_vms(deployment, 'ws2019s-sql17d', 'sql-server', "2017.0.#{version}-developer-windows-server-1809-standard")
 
-  # visual-studio
-  create_packer_windows_vms(deployment, 'w10e-dc-vs17c')
-  create_packer_windows_vms(deployment, 'w10e-dc-vs17p')
+  create_packer_vms(deployment, 'w10e-dc-vs17c', 'visual-studio', "2017.0.#{version}-community-windows-10-1809-enterprise")
+  create_packer_vms(deployment, 'w10e-dc-vs17p', 'visual-studio', "2017.0.#{version}-professional-windows-10-1809-enterprise")
+  create_packer_vms(deployment, 'w10e-dc-vs19c', 'visual-studio', "2019.0.#{version}-community-windows-10-1809-enterprise")
+  create_packer_vms(deployment, 'w10e-dc-vs19p', 'visual-studio', "2019.0.#{version}-professional-windows-10-1809-enterprise")
 
-  create_packer_windows_vms(deployment, 'ws2019s-dc-vs17c')
-  create_packer_windows_vms(deployment, 'ws2019s-dc-vs17p')
+  create_packer_vms(deployment, 'ws2019s-dc-vs17c', 'visual-studio', "2017.0.#{version}-community-windows-server-1809-standard")
+  create_packer_vms(deployment, 'ws2019s-dc-vs17p', 'visual-studio', "2017.0.#{version}-professional-windows-server-1809-standard")
+  create_packer_vms(deployment, 'ws2019s-dc-vs19c', 'visual-studio', "2019.0.#{version}-community-windows-server-1809-standard")
+  create_packer_vms(deployment, 'ws2019s-dc-vs19p', 'visual-studio', "2019.0.#{version}-professional-windows-server-1809-standard")
 end
 
-def create_packer_windows_vms(deployment, name)
+def create_packer_vms(deployment, name, cloud_name, cloud_version)
   create_local_packer_vm(deployment, name, 'sysprep')
-  create_cloud_packer_vm(deployment, name)
+  create_cloud_packer_vm(deployment, name, cloud_name, cloud_version)
 end
 
-def create_packer_linux_vms(deployment, name)
-  create_local_packer_vm(deployment, name, 'sysprep')
-  create_cloud_packer_vm(deployment, name)
-end
-
-def create_local_packer_vm(deployment, name, type = '')
-  type_suffix = type.to_s.empty? ? '' : "-#{type}"
-
+def create_local_packer_vm(deployment, name, type)
   VagrantMachine.configure(deployment, 'name' => "#{name}-local", 'box' => "gusztavvargadr/#{name}-local") do |machine|
     VagrantVirtualBoxProvider.configure(machine) do |provider|
-      provider.override.vm.box_url = "file://#{File.dirname(__FILE__)}/build/#{name}/virtualbox#{type_suffix}/output/vagrant.box"
+      provider.override.vm.box_url = "file://#{File.dirname(__FILE__)}/build/#{name}/virtualbox-#{type}/output/vagrant.box"
     end
 
     VagrantHyperVProvider.configure(machine) do |provider|
-      provider.override.vm.box_url = "file://#{File.dirname(__FILE__)}/build/#{name}/hyperv#{type_suffix}/output/vagrant.box"
+      provider.override.vm.box_url = "file://#{File.dirname(__FILE__)}/build/#{name}/hyperv-#{type}/output/vagrant.box"
     end
   end
 end
 
-def create_cloud_packer_vm(deployment, name)
+def create_cloud_packer_vm(deployment, name, cloud_name, cloud_version)
   VagrantMachine.configure(deployment, 'name' => "#{name}-cloud", 'box' => "gusztavvargadr/#{name}-cloud") do |machine|
     VagrantVirtualBoxProvider.configure(machine) do |provider|
-      provider.override.vm.box_url = "https://vagrantcloud.com/gusztavvargadr/boxes/#{name}/versions/#{version}/providers/virtualbox.box"
+      provider.override.vm.box_url = "https://vagrantcloud.com/gusztavvargadr/boxes/#{cloud_name}/versions/#{cloud_version}/providers/virtualbox.box"
     end
 
     VagrantHyperVProvider.configure(machine) do |provider|
-      provider.override.vm.box_url = "https://vagrantcloud.com/gusztavvargadr/boxes/#{name}/versions/#{version}/providers/hyperv.box"
+      provider.override.vm.box_url = "https://vagrantcloud.com/gusztavvargadr/boxes/#{cloud_name}/versions/#{cloud_version}/providers/hyperv.box"
     end
   end
 end

ci.cake

@@ -33,15 +33,19 @@ var ws2019s_sql17d = PackerTemplates_CreateWindows("ws2019s-sql17d", parents: ws
 var w10e_dc = PackerTemplates_CreateWindows("w10e-dc", parents: w10e);
 var w10e_dc_vs17c = PackerTemplates_CreateWindows("w10e-dc-vs17c", parents: w10e_dc);
 var w10e_dc_vs17p = PackerTemplates_CreateWindows("w10e-dc-vs17p", parents: w10e_dc);
+var w10e_dc_vs19c = PackerTemplates_CreateWindows("w10e-dc-vs19c", parents: w10e_dc);
+var w10e_dc_vs19p = PackerTemplates_CreateWindows("w10e-dc-vs19p", parents: w10e_dc);
 
 var ws2019s_dc = PackerTemplates_CreateWindows("ws2019s-dc", parents: ws2019s);
 var ws2019s_dc_vs17c = PackerTemplates_CreateWindows("ws2019s-dc-vs17c", parents: ws2019s_dc);
 var ws2019s_dc_vs17p = PackerTemplates_CreateWindows("ws2019s-dc-vs17p", parents: ws2019s_dc);
+var ws2019s_dc_vs19c = PackerTemplates_CreateWindows("ws2019s-dc-vs19c", parents: ws2019s_dc);
+var ws2019s_dc_vs19p = PackerTemplates_CreateWindows("ws2019s-dc-vs19p", parents: ws2019s_dc);
 
 packerTemplate = configuration;
 packerRecursive = recursive;
 
-IEnumerable<PackerTemplate> PackerTemplates_CreateWindows(string name, bool amazon = false, IEnumerable<PackerTemplate> parents = null) {
+IEnumerable<PackerTemplate> PackerTemplates_CreateWindows(string name, IEnumerable<PackerTemplate> parents = null) {
   var items = new List<PackerTemplate>();
 
   var virtualBoxCore = PackerTemplate_Create(
@@ -82,24 +86,12 @@ IEnumerable<PackerTemplate> PackerTemplates_CreateWindows(string name, bool amaz
   items.Add(hyperVCore);
   items.Add(hyperVSysprep);
 
-  if (amazon) {
-    var amazonSysprep = PackerTemplate_Create(
-      name,
-      "amazon",
-      new [] { PackerBuilder_Create("amazon") },
-      new [] { PackerProvisioner_Create("chef"), PackerProvisioner_Create("amazon-shutdown") },
-      new [] { PackerPostProcessor_Create("vagrant-amazon") },
-      null
-    );
-    items.Add(amazonSysprep);
-  }
-
   packerTemplates.AddRange(items);
 
   return items;
 }
 
-IEnumerable<PackerTemplate> PackerTemplates_CreateLinux(string name, bool amazon = false, bool azure = true, IEnumerable<PackerTemplate> parents = null) {
+IEnumerable<PackerTemplate> PackerTemplates_CreateLinux(string name, bool amazon = true, bool azure = true, IEnumerable<PackerTemplate> parents = null) {
   var items = new List<PackerTemplate>();
 
   var virtualBoxCore = PackerTemplate_Create(
@@ -146,8 +138,9 @@ IEnumerable<PackerTemplate> PackerTemplates_CreateLinux(string name, bool amazon
       "amazon",
       new [] { PackerBuilder_Create("amazon") },
       new [] { PackerProvisioner_Create("shell-prepare"), PackerProvisioner_Create("shell-configure"), PackerProvisioner_Create("shell-install"), PackerProvisioner_Create("shell-cleanup") },
-      new [] { PackerPostProcessor_Create("vagrant-amazon") },
-      null
+      new PackerPostProcessor[] {},
+      // new [] { PackerPostProcessor_Create("vagrant-amazon") },
+      parents != null ? parents.First(item => item.IsMatching("amazon")) : null
     );
     items.Add(amazonSysprep);
   }
@@ -159,7 +152,7 @@ IEnumerable<PackerTemplate> PackerTemplates_CreateLinux(string name, bool amazon
       new [] { PackerBuilder_Create(parents == null ? "azure-marketplace" : "azure-custom") },
       new [] { PackerProvisioner_Create("shell-prepare"), PackerProvisioner_Create("shell-configure"), PackerProvisioner_Create("shell-install"), PackerProvisioner_Create("shell-cleanup") },
       new PackerPostProcessor[] {},
-      null
+      parents != null ? parents.First(item => item.IsMatching("azure")) : null
     );
 
     items.Add(azureSysprep);

src/core/cake/template.cake

@@ -193,6 +193,10 @@ void PackerTemplate_MergeJson(PackerTemplate template) {
         var parentBuildOutputDirectory = parentBuildDirectory + "/output";
         jsonTemplateVariables["hyperv_clone_from_vmcx_path"] = parentBuildOutputDirectory;
       }
+      if (template.Builders.Any(item => item.IsMatching("azure"))) {
+        var artifactId = manifest["builds"][0]["artifact_id"].ToString();
+        jsonTemplateVariables["azure_image_name"] = artifactId.Split('/').Last();
+      }
     }
   }
   var descriptions = new List<string>();

src/dc/packer/provisioners/shell-install/scripts/custom.sh

@@ -17,8 +17,6 @@ do
   wget "https://raw.githubusercontent.com/docker/machine/v0.16.1/contrib/completion/bash/${i}" -P /etc/bash_completion.d
 done
 
-curl -L https://github.com/docker/compose/releases/download/1.23.2/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
+curl -L https://github.com/docker/compose/releases/download/1.24.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
 chmod +x /usr/local/bin/docker-compose
-curl -L https://raw.githubusercontent.com/docker/compose/1.23.2/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose
-
-usermod -aG docker vagrant
+curl -L https://raw.githubusercontent.com/docker/compose/1.24.0/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose

src/dc/packer/provisioners/shell-vagrant/scripts/custom.sh

@@ -1,3 +1,3 @@
 #!/bin/sh -eux
 
-usermod -aG docker vagrant
+usermod -aG docker $SUDO_USER

src/u/packer/builders/azure-custom/template.json

@@ -1,9 +1,9 @@
 {
   "variables": {
-    "azure_client_id": "{{env `ARM_CLIENT_ID`}}",
-    "azure_client_secret": "{{env `ARM_CLIENT_SECRET`}}",
-    "azure_tenant_id": "{{env `ARM_TENANT_ID`}}",
-    "azure_subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
+    "azure_client_id": "{{env `AZURE_CLIENT_ID`}}",
+    "azure_client_secret": "{{env `AZURE_CLIENT_SECRET`}}",
+    "azure_tenant_id": "{{env `AZURE_TENANT_ID`}}",
+    "azure_subscription_id": "{{env `AZURE_SUBSCRIPTION_ID`}}",
 
     "azure_resource_group": "packer",
     "azure_location": "West Europe",

src/u/packer/builders/hyperv-iso/template.json

@@ -9,6 +9,7 @@
       "iso_url": "{{user `iso_url`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_checksum": "{{user `iso_checksum`}}",
+      "headless": "{{user `hyperv_headless`}}",
       "ram_size": "{{user `hyperv_ram_size`}}",
       "enable_dynamic_memory": "{{user `hyperv_enable_dynamic_memory`}}",
       "cpu": "{{user `hyperv_cpu`}}",

src/u/packer/builders/hyperv-vmcx/template.json

@@ -7,6 +7,7 @@
       "type": "hyperv-vmcx",
       "vm_name": "{{user `author`}}-{{user `name`}}-{{user `version`}}-{{timestamp}}",
       "clone_from_vmcx_path": "{{user `hyperv_clone_from_vmcx_path`}}",
+      "headless": "{{user `hyperv_headless`}}",
       "ram_size": "{{user `hyperv_ram_size`}}",
       "enable_dynamic_memory": "{{user `hyperv_enable_dynamic_memory`}}",
       "cpu": "{{user `hyperv_cpu`}}",

src/u/packer/builders/hyperv/template.json

@@ -1,6 +1,7 @@
 {
   "min_packer_version": "1.3.0",
   "variables": {
+    "hyperv_headless": "true",
     "hyperv_ram_size": "4096",
     "hyperv_enable_dynamic_memory": "false",
     "hyperv_cpu": "2",

src/u/packer/builders/virtualbox-iso/template.json

@@ -11,6 +11,7 @@
       "iso_url": "{{user `iso_url`}}",
       "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_checksum": "{{user `iso_checksum`}}",
+      "headless": "{{user `virtualbox_headless`}}",
       "vboxmanage": [
         [
           "modifyvm",

src/u/packer/builders/virtualbox-ovf/template.json

@@ -7,6 +7,7 @@
       "type": "virtualbox-ovf",
       "vm_name": "{{user `author`}}-{{user `name`}}-{{user `version`}}-{{timestamp}}",
       "source_path": "{{user `virtualbox_source_path`}}",
+      "headless": "{{user `virtualbox_headless`}}",
       "vboxmanage": [
         [
           "modifyvm",

src/u/packer/builders/virtualbox/template.json

@@ -1,5 +1,6 @@
 {
   "variables": {
+    "virtualbox_headless": "true",
     "virtualbox_memory": "4096",
     "virtualbox_cpus": "2",
     "virtualbox_boot_wait": "10s",

src/u/packer/postprocessors/vagrant-virtualbox/Vagrantfile

@@ -2,6 +2,5 @@ Vagrant.configure(2) do |config|
   config.vm.provider 'virtualbox' do |vb|
     vb.memory = 1024
     vb.cpus = 1
-    vb.gui = true
   end
 end

src/u/packer/template.json

@@ -2,7 +2,7 @@
   "variables": {
     "name": "",
     "description": "",
-    "version": "1901.0.0",
+    "version": "1905.0.0",
     "author": "gusztavvargadr",
     "output_directory": "output"
   },

src/u16/packer/builders/iso/template.json

@@ -1,7 +1,7 @@
 {
   "variables": {
-    "iso_url": "http://releases.ubuntu.com/16.04.5/ubuntu-16.04.5-server-amd64.iso",
+    "iso_url": "http://releases.ubuntu.com/16.04.6/ubuntu-16.04.6-server-amd64.iso",
     "iso_checksum_type": "sha1",
-    "iso_checksum": "ee32c555567dd5407c58a1cfc7e668ab37a99d99"
+    "iso_checksum": "056b7c15efc15bbbf40bf1a9ff1a3531fcbf70a2"
   }
 }