Configure CI (no. 93)

riganti · Apr 30, 2021 · 62758a6 · 62758a6
1 parent 4bb4c4b
commit 62758a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,9 +5,11 @@ FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019
 
 RUN Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
 
+RUN scoop config shim kiennq
+
 RUN scoop install git; `
     scoop bucket add extras; `
-    scoop install chromium chromedriver
+    scoop install googlechrome chromedriver
 
 COPY --from=dotnet-installer ["/Program Files/dotnet", "/Program Files/dotnet"]
 
@@ -16,5 +18,6 @@ RUN dotnet help
 
 ENTRYPOINT []
 
+
 COPY artifacts/DotVVM.Samples.BasicSamples.Owin /inetpub/dotvvm.owin
 COPY src/DotVVM.Samples.Common /inetpub/DotVVM.Samples.Common
diff --git a/ci/windows/Dockerfile b/ci/windows/Dockerfile
@@ -3,13 +3,9 @@ FROM mcr.microsoft.com/dotnet/sdk:3.1 as dotnet-installer
 
 FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019
 
-RUN Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
+RUN Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')
 
-RUN scoop config shim kiennq
-
-RUN scoop install git; `
-    scoop bucket add extras; `
-    scoop install googlechrome chromedriver
+RUN choco install -y googlechrome chromedriver
 
 COPY --from=dotnet-installer ["/Program Files/dotnet", "/Program Files/dotnet"]