Merge pull request #1 from pserranoa/feature/add_chrome

Feature/add chrome
pserranoa · Oct 2, 2023 · 35302bb · 35302bb
2 parents 24ec20c + 72e50c9
commit 35302bb
Show file tree

Hide file tree

Showing 13 changed files with 86 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Changelog
+
+## 0.0.2 Oct 1, 2023
+
+    - Add Chrome browser to the image
diff --git a/README.es.md b/README.es.md
@@ -3,7 +3,7 @@
 
 # Packer, Vagrant y VirtualBox: eDNI-windows
 
-Windows 10 y 11 con firefox, eDNI remoto, lector de tarjetas y Autofirma para poder realizar gestiones con el DNI electrónico desde linux o windows.
+Windows 10 y 11 con firefox y chrome, eDNI remoto, lector de tarjetas y Autofirma para poder realizar gestiones con el DNI electrónico desde linux o windows.
 
 ## Introducción
 
@@ -22,6 +22,7 @@ Si necesitas utilizar desde linux o windows el e-DNI, puedes utilizar esta image
 Estas imagenes tienen instalado el siguiente software:
 
 - [Navegador Firefox](https://www.mozilla.org/es-ES/firefox/new/)
+- [Navegador Chrome](https://www.mozilla.org/es-ES/firefox/new/)
 - [eDNI Remote 3.0](https://www.eDNIlectronico.es/descargas/Apps/Instalador_eDNIRemote_x64.exe)
 - [Instalador tarjetatas eDNI v15.0.1](https://www.eDNIlectronico.es/descargas/CSP_para_Sistemas_Windows/Windows_64_bits/Instalador_Tarjetas_eDNI_x64.exe)
 - [Autofirma version 1.8.2 (msi)](https://estaticos.redsara.es/comunes/autofirma/currentversion/AutoFirma64.zip)
@@ -163,25 +164,25 @@ Una vez que generamos la imagen dentro de las ejecuciones bajo la carpeta *build
 Para añadir la imagen a vagrant, debes ejecutar el siguiente comando, en el caso de haber construido en local la imagen de windows-10_64, y haber utilizado la configuración por defecto, accede a la carpeta *builds/windows-10_64* y ejecuta los siguiente comandos: (recuerda parametrizar tu fichero de **Vagrantfile**, para que se ajuste a tus necesidades. Tienes un ejemplo en la sección [Ejemplo de Vagrantfile](#ejemplo-de-vagrantfile))
 
 ```shell
-vagrant box add pserranoa/eDNI-windows-10_64 eDNI-windows-10_64_0.0.1.box
+vagrant box add pserranoa/eDNI-windows-10_64 eDNI-windows-10_64_<version>.box
 vagrant init pserranoa/eDNI-windows-10_64
 vagrant up
 ```
 
 ```shell
-vagrant box add pserranoa/eDNI-windows-11_64 eDNI-windows-11_64_0.0.1.box
+vagrant box add pserranoa/eDNI-windows-11_64 eDNI-windows-11_64_<version>.box
 vagrant init pserranoa/eDNI-windows-11_64
 vagrant up
 ```
 
 ## Imagenes subidas a Vagrant Cloud
 
-| Imagen | Version | Tamaño | sha512sum | Fecha |
-| ------ | ------- | ------ | --------- | ----- |
-|[pserranoa/eDNI-windows-10_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-10_64) | **0.0.1** | 5.89 GB | 40115f6f980657fd5d0e699e67149fce5d7b768389284ea7dd26b32772987449b855505bc26c38c7fb856de1c9057ad886ea092994f6824b73e31b9827c68225 | 13/08/2023 |
-|[pserranoa/eDNI-windows-11_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-11_64) | **0.0.1** | 6.33 GB | 4f5fe450aed37bd1e293954c88323461af412a8a509813abb257fbfcc809b8b8b340d39fd4f0b534fc0c84fbff40516ac7b4de9e15ba57e90450762ae9366c08 | 13/08/2023 |
-|[pserranoa/eDNI-windows-10-wu_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-10-wu_64) | **0.0.1** | 11 GB | e7ae13d76c3f1400f1a8cd25ee97931dbd19853df0ca39e4cbb95559ffa1e3f92d0fcbc453efbf4d6c10e0bbada58ed47086309785429119064f69cea6817103 | 13/08/2023 |
-|[pserranoa/eDNI-windows-11-wu_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-11-wu_64) | **0.0.1** | 11 GB | 0a645d640aa8b5b48bfe1e4a6f87f901597f935744ff73f3244c4a44d78d3b93ae03afb86ae0eab3f809564733d91339342a416b7d834d54ebd300db35f70a75 | 13/08/2023 |
+| Imagen | Version | Size | sha512sum | Date |
+| ------ | ------- | ---- | --------- | ---- |
+|[pserranoa/eDNI-windows-10_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-10_64) | **0.0.2** | 6.3 GB | f22d2beae8cc2fc458d7f935156b27aeebf74dae0c61abe9b551cc29b4274195c1b39903626b6189e72d10d23d34ba69f33c4b62def9e622fa258603363714dc | 02/10/2023 |
+|[pserranoa/eDNI-windows-11_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-11_64) | **0.0.2** | 6.5 GB | a3a6687fcd81bca365cc4e97c1f56854db9606fc6ca94f5c81de60df7e8e5135ee7791bf77cf9c1dd22b5d47f752da979e992aa6013460cce1e1dc9a2fe17e49 | 02/10/2023 |
+|[pserranoa/eDNI-windows-10-wu_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-10-wu_64) | **0.0.2** | 12 GB | bf1d64dab7a1f678a3288ea959b1efc8d6e908ac445e40ddb941a87a8b8634d2aee9596be61db579e0b84f09da1604b83f807e4a5e37b30fe788c1def36f1e88 | 02/10/2023 |
+|[pserranoa/eDNI-windows-11-wu_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-11-wu_64) | **0.0.2** | 12 GB | 0a3c97e3b565c35f4a629a4d0c30b720906056f49b4d41801cd1488ea4edc2ee15f512b1eee9c386bde42dc6d7f2f86851ee08257d758a86c650c10106c50b97 | 02/10/2023 |
 
 ## Referencias
 

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 # Packer, Vagrant and VirtualBox: eDNI-windows
 
-Windows 10 and 11 with firefox, remote Spanish eDNI, card readers and Spanish signer to to be able to carry out procedures with the Spanish electronic DNI from your linux or Windows box.
+Windows 10 and 11 with firefox and chrome, remote Spanish eDNI, card readers and Spanish signer to to be able to carry out procedures with the Spanish electronic DNI from your linux or Windows box.
 
 ## Introduction
 
@@ -179,10 +179,10 @@ vagrant up
 
 | Imagen | Version | Size | sha512sum | Date |
 | ------ | ------- | ---- | --------- | ---- |
-|[pserranoa/eDNI-windows-10_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-10_64) | **0.0.1** | 5.89 GB | 40115f6f980657fd5d0e699e67149fce5d7b768389284ea7dd26b32772987449b855505bc26c38c7fb856de1c9057ad886ea092994f6824b73e31b9827c68225 | 13/08/2023 |
-|[pserranoa/eDNI-windows-11_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-11_64) | **0.0.1** | 6.33 GB | 4f5fe450aed37bd1e293954c88323461af412a8a509813abb257fbfcc809b8b8b340d39fd4f0b534fc0c84fbff40516ac7b4de9e15ba57e90450762ae9366c08 | 13/08/2023 |
-|[pserranoa/eDNI-windows-10-wu_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-10-wu_64) | **0.0.1** | 11 GB | e7ae13d76c3f1400f1a8cd25ee97931dbd19853df0ca39e4cbb95559ffa1e3f92d0fcbc453efbf4d6c10e0bbada58ed47086309785429119064f69cea6817103 | 13/08/2023 |
-|[pserranoa/eDNI-windows-11-wu_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-11-wu_64) | **0.0.1** | 11 GB | 0a645d640aa8b5b48bfe1e4a6f87f901597f935744ff73f3244c4a44d78d3b93ae03afb86ae0eab3f809564733d91339342a416b7d834d54ebd300db35f70a75 | 13/08/2023 |
+|[pserranoa/eDNI-windows-10_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-10_64) | **0.0.2** | 6.3 GB | f22d2beae8cc2fc458d7f935156b27aeebf74dae0c61abe9b551cc29b4274195c1b39903626b6189e72d10d23d34ba69f33c4b62def9e622fa258603363714dc | 02/10/2023 |
+|[pserranoa/eDNI-windows-11_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-11_64) | **0.0.2** | 6.5 GB | a3a6687fcd81bca365cc4e97c1f56854db9606fc6ca94f5c81de60df7e8e5135ee7791bf77cf9c1dd22b5d47f752da979e992aa6013460cce1e1dc9a2fe17e49 | 02/10/2023 |
+|[pserranoa/eDNI-windows-10-wu_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-10-wu_64) | **0.0.2** | 12 GB | bf1d64dab7a1f678a3288ea959b1efc8d6e908ac445e40ddb941a87a8b8634d2aee9596be61db579e0b84f09da1604b83f807e4a5e37b30fe788c1def36f1e88 | 02/10/2023 |
+|[pserranoa/eDNI-windows-11-wu_64](https://app.vagrantup.com/pserranoa/boxes/eDNI-windows-11-wu_64) | **0.0.2** | 12 GB | 0a3c97e3b565c35f4a629a4d0c30b720906056f49b4d41801cd1488ea4edc2ee15f512b1eee9c386bde42dc6d7f2f86851ee08257d758a86c650c10106c50b97 | 02/10/2023 |
 
 ## References
 

diff --git a/scripts/eDNI/chrome.ps1 b/scripts/eDNI/chrome.ps1
@@ -0,0 +1,13 @@
+$source = "https://dl.google.com/chrome/install/latest/chrome_installer.exe"
+Write-Output "Installing Chrome"
+
+$workdir = "c:\installer\"
+If ( !(Test-Path -Path $workdir -PathType Container))
+    { New-Item -Path $workdir  -ItemType directory }
+
+
+$destination = "$workdir\chrome_installer.exe"
+Start-BitsTransfer -Source $source -Destination $destination -TransferType Download -Priority High
+Start-Process -FilePath "$workdir\chrome_installer.exe" -ArgumentList "/silent /install" -Wait
+Start-Sleep -s 30
+rm -Force $workdir/chrome_installer*
diff --git a/templates/windows-10-wu_64/Autounattend.xml b/templates/windows-10-wu_64/Autounattend.xml
@@ -192,40 +192,46 @@
                     <Order>15</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\chrome.ps1</CommandLine>
+                    <Description>Install Chrome</Description>
+                    <Order>16</Order>
+                    <RequiresUserInput>true</RequiresUserInput>
+                </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\virtualbox-tools.ps1</CommandLine>
                     <Description>Install virtualbox-tools</Description>
-                    <Order>16</Order>
+                    <Order>17</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\enable-rdp.ps1</CommandLine>
                     <Description>Enable RDP</Description>
-                    <Order>17</Order>
+                    <Order>18</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\DNIeRemote.ps1</CommandLine>
                     <Description>DNIeRemote</Description>
-                    <Order>18</Order>
+                    <Order>19</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\Tarjetas_DNIe.ps1</CommandLine>
                     <Description>Tarjetas_DNIe</Description>
-                    <Order>19</Order>
+                    <Order>20</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\AutoFirma.ps1</CommandLine>
                     <Description>AutoFirma</Description>
-                    <Order>20</Order>
+                    <Order>21</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\win-updates.ps1 -BeginWithRestart 1</CommandLine>
                     <Description>Install Windows Updates</Description>
-                    <Order>21</Order>
+                    <Order>22</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
             </FirstLogonCommands>

diff --git a/templates/windows-10-wu_64/vars.pkrvars.hcl b/templates/windows-10-wu_64/vars.pkrvars.hcl
@@ -1,6 +1,6 @@
 template      = "windows-10-wu_64"
 guest_os_type = "Windows10_64"
-version       = "0.0.1"
+version       = "0.0.2"
 record        = "on"
 iso_url       = "https://software-static.download.prss.microsoft.com/dbazure/988969d5-f34g-4e03-ac9d-1f9786c66750/19045.2006.220908-0225.22h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_es-es.iso"
 iso_checksum  = "04e5cd52bce1d59e94b9db0415d4fc8a"
diff --git a/templates/windows-10_64/Autounattend.xml b/templates/windows-10_64/Autounattend.xml
@@ -192,40 +192,46 @@
                     <Order>15</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\chrome.ps1</CommandLine>
+                    <Description>Install Chrome</Description>
+                    <Order>16</Order>
+                    <RequiresUserInput>true</RequiresUserInput>
+                </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\virtualbox-tools.ps1</CommandLine>
                     <Description>Install virtualbox-tools</Description>
-                    <Order>16</Order>
+                    <Order>17</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\enable-rdp.ps1</CommandLine>
                     <Description>Enable RDP</Description>
-                    <Order>17</Order>
+                    <Order>18</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\DNIeRemote.ps1</CommandLine>
                     <Description>DNIeRemote</Description>
-                    <Order>18</Order>
+                    <Order>19</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\Tarjetas_DNIe.ps1</CommandLine>
                     <Description>Tarjetas_DNIe</Description>
-                    <Order>19</Order>
+                    <Order>20</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\AutoFirma.ps1</CommandLine>
                     <Description>AutoFirma</Description>
-                    <Order>20</Order>
+                    <Order>21</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\enable-winrm.ps1</CommandLine>
                     <Description>Enable WinRM</Description>
-                    <Order>21</Order>
+                    <Order>22</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
             </FirstLogonCommands>

diff --git a/templates/windows-10_64/vars.pkrvars.hcl b/templates/windows-10_64/vars.pkrvars.hcl
@@ -1,6 +1,6 @@
 template      = "windows-10_64"
 guest_os_type = "Windows10_64"
-version       = "0.0.1"
+version       = "0.0.2"
 record        = "on"
 iso_url       = "https://software-static.download.prss.microsoft.com/dbazure/988969d5-f34g-4e03-ac9d-1f9786c66750/19045.2006.220908-0225.22h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_es-es.iso"
 iso_checksum  = "04e5cd52bce1d59e94b9db0415d4fc8a"
diff --git a/templates/windows-11-wu_64/Autounattend.xml b/templates/windows-11-wu_64/Autounattend.xml
@@ -200,40 +200,46 @@
                     <Order>15</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\chrome.ps1</CommandLine>
+                    <Description>Install Chrome</Description>
+                    <Order>16</Order>
+                    <RequiresUserInput>true</RequiresUserInput>
+                </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\virtualbox-tools.ps1</CommandLine>
                     <Description>Install virtualbox-tools</Description>
-                    <Order>16</Order>
+                    <Order>17</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\enable-rdp.ps1</CommandLine>
                     <Description>Enable RDP</Description>
-                    <Order>17</Order>
+                    <Order>18</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\DNIeRemote.ps1</CommandLine>
                     <Description>DNIeRemote</Description>
-                    <Order>18</Order>
+                    <Order>19</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\Tarjetas_DNIe.ps1</CommandLine>
                     <Description>Tarjetas_DNIe</Description>
-                    <Order>19</Order>
+                    <Order>20</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\AutoFirma.ps1</CommandLine>
                     <Description>AutoFirma</Description>
-                    <Order>20</Order>
+                    <Order>21</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File E:\win-updates.ps1 -BeginWithRestart 1</CommandLine>
                     <Description>Install Windows Updates</Description>
-                    <Order>21</Order>
+                    <Order>22</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
             </FirstLogonCommands>

diff --git a/templates/windows-11-wu_64/vars.pkrvars.hcl b/templates/windows-11-wu_64/vars.pkrvars.hcl
@@ -1,6 +1,6 @@
 template      = "windows-11-wu_64"
 guest_os_type = "Windows11_64"
-version       = "0.0.1"
+version       = "0.0.2"
 record        = "on"
 iso_url       = "https://software-static.download.prss.microsoft.com/dbazure/988969d5-f34g-4e03-ac9d-1f9786c66751/22621.525.220925-0207.ni_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_es-es.iso"
 iso_checksum  = "b64842e951f64a5b67b4845989dd3ab6"