This is an automated email from the ASF dual-hosted git repository.

onichols pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/support/1.12 by this push:
     new 2d2bcbf  GEODE-7950: Force TLS1.2 for installing PackageProvider=NuGet 
(#4908)
2d2bcbf is described below

commit 2d2bcbf7688c4434b918b1904f16c98ee5da9055
Author: Robert Houghton <rhough...@pivotal.io>
AuthorDate: Mon Apr 6 13:16:11 2020 -0700

    GEODE-7950: Force TLS1.2 for installing PackageProvider=NuGet (#4908)
    
    Would be nice to set the default TLS for all PowerShell sessions, but
    that seems to be unsupported.
    
    (cherry picked from commit e7f6faf637fc77daa1ca4bd942be0c10e9577dc7)
---
 ci/images/google-windows-geode-builder/build_image.sh      | 3 ++-
 ci/images/google-windows-geode-builder/windows-packer.json | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ci/images/google-windows-geode-builder/build_image.sh 
b/ci/images/google-windows-geode-builder/build_image.sh
index 741e21b..2c2fd96 100755
--- a/ci/images/google-windows-geode-builder/build_image.sh
+++ b/ci/images/google-windows-geode-builder/build_image.sh
@@ -18,7 +18,7 @@
 
 PACKER=${PACKER:-packer}
 PACKER_ARGS="${*}"
-INTERNAL=${INTERNAL:-true}
+INTERNAL=${INTERNAL:-false}
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a 
symlink
   SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
@@ -46,6 +46,7 @@ if [[ -n "${MY_NAME}" ]]; then
   GCP_NETWORK=${GCP_NETWORK##*/}
   GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r 
'.networkInterfaces[0].subnetwork')
   GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
+  INTERNAL=true
 fi
 
 if [[ -z "${GCP_PROJECT}" ]]; then
diff --git a/ci/images/google-windows-geode-builder/windows-packer.json 
b/ci/images/google-windows-geode-builder/windows-packer.json
index 17d0542..20e169b 100644
--- a/ci/images/google-windows-geode-builder/windows-packer.json
+++ b/ci/images/google-windows-geode-builder/windows-packer.json
@@ -53,6 +53,7 @@
       "inline": [
         "$ErrorActionPreference = \"Stop\"",
         "Set-ExecutionPolicy Bypass -Scope Process -Force",
+        "[Net.ServicePointManager]::SecurityProtocol = 
[Net.SecurityProtocolType]::Tls12",
         "Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force",
         "Install-Module DockerMsftProvider -Force",
         "Install-Package Docker -ProviderName DockerMsftProvider -Force",

Reply via email to