From 163f9c2e99b90a5129b62bdaf3620c1b257c51e6 Mon Sep 17 00:00:00 2001 From: David Finol Date: Wed, 26 Jan 2022 16:05:03 -0600 Subject: [PATCH] Install git on windows images (#149) * Install git on windows images * Move chocolatey to the base windows image --- images/windows/base/Dockerfile | 3 +++ images/windows/editor/Dockerfile | 3 +++ images/windows/hub/Dockerfile | 3 --- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/windows/base/Dockerfile b/images/windows/base/Dockerfile index 1f13398a..9c57e485 100644 --- a/images/windows/base/Dockerfile +++ b/images/windows/base/Dockerfile @@ -25,3 +25,6 @@ COPY --from=dll-source c:/windows/system32/BluetoothApis.dll \ # Enable executing powershell scripts RUN powershell -Command Set-ExecutionPolicy unrestricted + +# Install chocolatey +RUN powershell -Command Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) diff --git a/images/windows/editor/Dockerfile b/images/windows/editor/Dockerfile index eb205cdd..b7cb20ee 100644 --- a/images/windows/editor/Dockerfile +++ b/images/windows/editor/Dockerfile @@ -52,3 +52,6 @@ RUN powershell -Command foreach ($service in 'nlasvc', 'netprofm') {"Set-Service # Not needed with the dotnet base image # RUN powershell -Command Set-Service 'wmiApSrv' -StartupType Automatic + +# Packages/manifest.json could have git dependencies +RUN choco install git diff --git a/images/windows/hub/Dockerfile b/images/windows/hub/Dockerfile index ffdfcbdd..e6bcb5d5 100644 --- a/images/windows/hub/Dockerfile +++ b/images/windows/hub/Dockerfile @@ -2,8 +2,5 @@ ARG baseImage="unityci/base:windows-latest" FROM $baseImage -# Install chocolatey -RUN powershell -Command Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) - # Install unity hub RUN choco install unity-hub --no-progress -y