Commit d9520b21 authored by Stefan Scherer's avatar Stefan Scherer
Browse files

Retina, pin PowerShell

parent f583f62f
...@@ -26,13 +26,23 @@ Vagrant.configure("2") do |config| ...@@ -26,13 +26,23 @@ Vagrant.configure("2") do |config|
end end
config.vm.provider :vmware_fusion do |v, override| config.vm.provider :vmware_fusion do |v, override|
#v.gui = true v.gui = true
v.vmx["memsize"] = "2048" v.vmx["memsize"] = "2048"
v.vmx["numvcpus"] = "2" v.vmx["numvcpus"] = "2"
v.vmx["ethernet0.virtualDev"] = "vmxnet3" v.vmx["ethernet0.virtualDev"] = "vmxnet3"
v.vmx["RemoteDisplay.vnc.enabled"] = "false" v.vmx["RemoteDisplay.vnc.enabled"] = "false"
v.vmx["RemoteDisplay.vnc.port"] = "5900" v.vmx["RemoteDisplay.vnc.port"] = "5900"
v.vmx["scsi0.virtualDev"] = "lsisas1068" v.vmx["scsi0.virtualDev"] = "lsisas1068"
v.enable_vmrun_ip_lookup = false
v.vmx["gui.fitguestusingnativedisplayresolution"] = "TRUE"
v.vmx["mks.enable3d"] = "TRUE"
v.vmx["mks.forceDiscreteGPU"] = "TRUE"
v.vmx["gui.fullscreenatpoweron"] = "TRUE"
v.vmx["gui.viewmodeatpoweron"] = "fullscreen"
v.vmx["gui.lastPoweredViewMode"] = "fullscreen"
v.vmx["sound.startconnected"] = "TRUE"
v.vmx["sound.present"] = "TRUE"
v.vmx["sound.autodetect"] = "TRUE"
end end
config.vm.provider :vmware_workstation do |v, override| config.vm.provider :vmware_workstation do |v, override|
......
# -*- mode: ruby -*-
# vi: set ft=ruby :
Vagrant.require_version ">= 1.6.2"
Vagrant.configure("2") do |config|
config.vm.define "vagrant-windows-2016"
config.vm.box = "windows_2016"
config.vm.communicator = "winrm"
# Admin user name and password
config.winrm.username = "vagrant"
config.winrm.password = "vagrant"
config.vm.guest = :windows
config.windows.halt_timeout = 15
config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct: true
config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct: true
config.vm.provider :virtualbox do |v, override|
#v.gui = true
v.customize ["modifyvm", :id, "--memory", 2048]
v.customize ["modifyvm", :id, "--cpus", 2]
v.customize ["setextradata", "global", "GUI/SuppressMessages", "all" ]
end
config.vm.provider :vmware_fusion do |v, override|
v.gui = true
v.vmx["memsize"] = "2048"
v.vmx["numvcpus"] = "2"
v.vmx["ethernet0.virtualDev"] = "vmxnet3"
v.vmx["RemoteDisplay.vnc.enabled"] = "false"
v.vmx["RemoteDisplay.vnc.port"] = "5900"
v.vmx["scsi0.virtualDev"] = "lsisas1068"
v.vmx["vhv.enable"] = "TRUE"
v.vmx["hypervisor.cpuid.v0"] = "FALSE"
v.enable_vmrun_ip_lookup = false
v.vmx["gui.fitguestusingnativedisplayresolution"] = "TRUE"
v.vmx["mks.enable3d"] = "TRUE"
v.vmx["mks.forceDiscreteGPU"] = "TRUE"
v.vmx["gui.fullscreenatpoweron"] = "TRUE"
v.vmx["gui.viewmodeatpoweron"] = "fullscreen"
v.vmx["gui.lastPoweredViewMode"] = "fullscreen"
v.vmx["sound.startconnected"] = "TRUE"
v.vmx["sound.present"] = "TRUE"
v.vmx["sound.autodetect"] = "TRUE"
end
config.vm.provider :vmware_workstation do |v, override|
#v.gui = true
v.vmx["memsize"] = "2048"
v.vmx["numvcpus"] = "2"
v.vmx["ethernet0.virtualDev"] = "vmxnet3"
v.vmx["RemoteDisplay.vnc.enabled"] = "false"
v.vmx["RemoteDisplay.vnc.port"] = "5900"
v.vmx["scsi0.virtualDev"] = "lsisas1068"
v.vmx["vhv.enable"] = "TRUE"
v.vmx["hypervisor.cpuid.v0"] = "FALSE"
end
end
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
"vnc_port_max": 5980, "vnc_port_max": 5980,
"floppy_files": [ "floppy_files": [
"./answer_files/2016/Autounattend.xml", "./answer_files/2016/Autounattend.xml",
"./floppy/Windows Powershell.lnk",
"./floppy/PinTo10.exe",
"./scripts/disable-winrm.ps1", "./scripts/disable-winrm.ps1",
"./scripts/enable-winrm.ps1", "./scripts/enable-winrm.ps1",
"./scripts/microsoft-updates.bat", "./scripts/microsoft-updates.bat",
...@@ -52,6 +54,8 @@ ...@@ -52,6 +54,8 @@
"disk_size": 61440, "disk_size": 61440,
"floppy_files": [ "floppy_files": [
"./answer_files/2016/Autounattend.xml", "./answer_files/2016/Autounattend.xml",
"./floppy/Windows Powershell.lnk",
"./floppy/PinTo10.exe",
"./scripts/disable-winrm.ps1", "./scripts/disable-winrm.ps1",
"./scripts/2016/enable-winrm.ps1", "./scripts/2016/enable-winrm.ps1",
"./scripts/microsoft-updates.bat", "./scripts/microsoft-updates.bat",
...@@ -81,7 +85,19 @@ ...@@ -81,7 +85,19 @@
"scripts": [ "scripts": [
"./scripts/vm-guest-tools.bat", "./scripts/vm-guest-tools.bat",
"./scripts/enable-rdp.bat" "./scripts/enable-rdp.bat"
"./scripts/uac-enable.bat" ]
},
{
"type": "windows-restart"
},
{
"type": "windows-shell",
"execute_command": "{{ .Vars }} cmd /c \"{{ .Path }}\"",
"scripts": [
"./scripts/pin-powershell.bat",
"./scripts/set-winrm-automatic.bat",
"./scripts/uac-enable.bat",
"./scripts/compact.bat"
] ]
} }
], ],
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
"vnc_port_max": 5980, "vnc_port_max": 5980,
"floppy_files": [ "floppy_files": [
"./answer_files/2016/Autounattend.xml", "./answer_files/2016/Autounattend.xml",
"./floppy/Windows Powershell.lnk",
"./floppy/PinTo10.exe",
"./scripts/disable-winrm.ps1", "./scripts/disable-winrm.ps1",
"./scripts/docker/enable-winrm.ps1", "./scripts/docker/enable-winrm.ps1",
"./scripts/microsoft-updates.bat", "./scripts/microsoft-updates.bat",
...@@ -52,6 +54,8 @@ ...@@ -52,6 +54,8 @@
"disk_size": 61440, "disk_size": 61440,
"floppy_files": [ "floppy_files": [
"./answer_files/2016/Autounattend.xml", "./answer_files/2016/Autounattend.xml",
"./floppy/Windows Powershell.lnk",
"./floppy/PinTo10.exe",
"./scripts/disable-winrm.ps1", "./scripts/disable-winrm.ps1",
"./scripts/docker/enable-winrm.ps1", "./scripts/docker/enable-winrm.ps1",
"./scripts/microsoft-updates.bat", "./scripts/microsoft-updates.bat",
...@@ -79,7 +83,6 @@ ...@@ -79,7 +83,6 @@
"type": "windows-shell", "type": "windows-shell",
"execute_command": "{{ .Vars }} cmd /c \"{{ .Path }}\"", "execute_command": "{{ .Vars }} cmd /c \"{{ .Path }}\"",
"scripts": [ "scripts": [
"./scripts/set-winrm-automatic.bat",
"./scripts/vm-guest-tools.bat", "./scripts/vm-guest-tools.bat",
"./scripts/enable-rdp.bat" "./scripts/enable-rdp.bat"
] ]
...@@ -91,7 +94,7 @@ ...@@ -91,7 +94,7 @@
"type": "windows-shell", "type": "windows-shell",
"execute_command": "{{ .Vars }} cmd /c \"{{ .Path }}\"", "execute_command": "{{ .Vars }} cmd /c \"{{ .Path }}\"",
"scripts": [ "scripts": [
"./scripts/wait-for-uplink.bat", "./scripts/pin-powershell.bat",
"./scripts/uac-enable.bat" "./scripts/uac-enable.bat"
] ]
}, },
...@@ -101,6 +104,14 @@ ...@@ -101,6 +104,14 @@
"./scripts/install-docker.ps1", "./scripts/install-docker.ps1",
"./scripts/enable-docker-unsecure.ps1" "./scripts/enable-docker-unsecure.ps1"
] ]
},
{
"type": "windows-shell",
"scripts": [
"./scripts/set-winrm-automatic.bat",
"./scripts/uac-enable.bat",
"./scripts/compact.bat"
]
} }
], ],
"post-processors": [ "post-processors": [
...@@ -108,7 +119,7 @@ ...@@ -108,7 +119,7 @@
"type": "vagrant", "type": "vagrant",
"keep_input_artifact": false, "keep_input_artifact": false,
"output": "windows_2016_docker_{{.Provider}}.box", "output": "windows_2016_docker_{{.Provider}}.box",
"vagrantfile_template": "vagrantfile-windows_2016.template" "vagrantfile_template": "vagrantfile-windows_2016_docker.template"
} }
] ]
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment