From b434f4d70ac7bb5716ae8f8649b15cc8f9f0cd8d Mon Sep 17 00:00:00 2001 From: Greg Mann Date: Mon, 10 Feb 2020 22:14:45 -0800 Subject: [PATCH] Update the build server dependency script. This patch fixes broken links in the build server dependency installation script. It also removes the Docker installation, as the method previously used to install Docker from the command line no longer works. --- Jenkins/set-up-windows-jenkins-build-server.ps1 | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Jenkins/set-up-windows-jenkins-build-server.ps1 b/Jenkins/set-up-windows-jenkins-build-server.ps1 index db914671..59b1ce8b 100644 --- a/Jenkins/set-up-windows-jenkins-build-server.ps1 +++ b/Jenkins/set-up-windows-jenkins-build-server.ps1 @@ -59,11 +59,11 @@ $PACKAGES = @{ "local_file" = Join-Path $PACKAGES_DIRECTORY "otp_win64.exe" } "maven" = @{ - "url" = "http://apache.javapipe.com/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.zip" + "url" = "http://www.trieuvan.com/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip" "local_file" = Join-Path $PACKAGES_DIRECTORY "maven.zip" } "openssl" = @{ - "url" = "https://slproweb.com/download/Win64OpenSSL-1_0_2p.exe" + "url" = "https://slproweb.com/download/Win64OpenSSL-1_1_1d.exe" "local_file" = Join-Path $PACKAGES_DIRECTORY "openssl.exe" } } @@ -213,16 +213,6 @@ function Install-VisualStudio2017 { -ArgumentList $installerArguments } -function Install-Docker { - $service = Get-Service "Docker" -ErrorAction SilentlyContinue - if($service) { - Stop-Service "Docker" - } - Install-Module -Name "DockerMsftProvider" -Force - Install-Package -Name "Docker" -ProviderName "DockerMsftProvider" -Force -MinimumVersion "18.03.1-ee-1" - Start-Service "Docker" -} - function Install-Git { $installDir = Join-Path $env:ProgramFiles "Git" Install-CITool -InstallerPath $PACKAGES["git"]["local_file"] ` @@ -386,7 +376,6 @@ function Install-PowerShellModules { try { Start-LocalPackagesDownload Install-VisualStudio2017 - Install-Docker Install-7Zip Install-Msys2 Install-Git @@ -401,6 +390,7 @@ try { Install-Dig Install-Erlang Install-PowerShellModules + # TODO: Install Docker # TODO: Configure git user and e-mail # TODO: Generate SSH keypair # TODO: Authorize Git SSH Keys