From 072338424df29b062ca64da40adb9a9468588f62 Mon Sep 17 00:00:00 2001 From: Stephen Brawner Date: Wed, 3 Jun 2020 11:32:29 -0700 Subject: [PATCH 1/2] Revert PR 462 and unpin version of MSVS Signed-off-by: Stephen Brawner --- windows_docker_resources/Dockerfile.dashing | 7 ++++--- windows_docker_resources/Dockerfile.foxy | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/windows_docker_resources/Dockerfile.dashing b/windows_docker_resources/Dockerfile.dashing index 58dce4ee4..745c8cd01 100644 --- a/windows_docker_resources/Dockerfile.dashing +++ b/windows_docker_resources/Dockerfile.dashing @@ -138,9 +138,10 @@ COPY rticonnextdds-src\rti_security_plugins-5.3.1-target-x64Win64VS2017.rtipkg C RUN ""%ProgramFiles%\rti_connext_dds-5.3.1\bin\rtipkginstall.bat" C:\TEMP\connext\rti_security_plugins-5.3.1-target-x64Win64VS2017.rtipkg" # Visual Studio Build Tools and .Net SDK` -# Pinning to 16.5.5 as building the netifaces wheel fails to find VC++ -ADD https://download.visualstudio.microsoft.com/download/pr/68d6b204-9df0-4fcc-abcc-08ee0eff9cb2/17af83ed545d1287df7575786c326009e459708b60a6821d2a4f5606ef8efb9e/vs_BuildTools.exe C:\TEMP\ -# ADD https://aka.ms/vs/16/release/vs_BuildTools.exe C:\TEMP\ +# If the most recent MSVS BuildTools causes new issues, previous releases of BuildTools can be found here: +# https://docs.microsoft.com/en-us/visualstudio/releases/2019/history +RUN echo "Temporary echo to purge docker caches for PR #465" +ADD https://aka.ms/vs/16/release/vs_BuildTools.exe C:\TEMP\ # 3010 is an acceptable exit code (install was successful but restart required), but it will confuse docker. # This installer invalidates docker image caches pretty regularly, so it's late in the order. See documentation for installer at: diff --git a/windows_docker_resources/Dockerfile.foxy b/windows_docker_resources/Dockerfile.foxy index 313d6a5d7..1871ad30c 100644 --- a/windows_docker_resources/Dockerfile.foxy +++ b/windows_docker_resources/Dockerfile.foxy @@ -138,9 +138,10 @@ COPY rticonnextdds-src\rti_security_plugins-5.3.1-target-x64Win64VS2017.rtipkg C RUN ""%ProgramFiles%\rti_connext_dds-5.3.1\bin\rtipkginstall.bat" C:\TEMP\connext\rti_security_plugins-5.3.1-target-x64Win64VS2017.rtipkg" # Visual Studio Build Tools and .Net SDK` -# Pinning to 16.5.5 as building the netifaces wheel fails to find VC++ -ADD https://download.visualstudio.microsoft.com/download/pr/68d6b204-9df0-4fcc-abcc-08ee0eff9cb2/17af83ed545d1287df7575786c326009e459708b60a6821d2a4f5606ef8efb9e/vs_BuildTools.exe C:\TEMP\ -# ADD https://aka.ms/vs/16/release/vs_BuildTools.exe C:\TEMP\ +# If the most recent MSVS BuildTools causes new issues, previous releases of BuildTools can be found here: +# https://docs.microsoft.com/en-us/visualstudio/releases/2019/history +RUN echo "Temporary echo to purge docker caches for PR #465" +ADD https://aka.ms/vs/16/release/vs_BuildTools.exe C:\TEMP\ # 3010 is an acceptable exit code (install was successful but restart required), but it will confuse docker. # This installer invalidates docker image caches pretty regularly, so it's late in the order. See documentation for installer at: From f214770bd002005b023196b26641a679a1cb0bf2 Mon Sep 17 00:00:00 2001 From: Stephen Brawner Date: Wed, 3 Jun 2020 13:40:24 -0700 Subject: [PATCH 2/2] Remove echo --- windows_docker_resources/Dockerfile.dashing | 1 - windows_docker_resources/Dockerfile.foxy | 1 - 2 files changed, 2 deletions(-) diff --git a/windows_docker_resources/Dockerfile.dashing b/windows_docker_resources/Dockerfile.dashing index 745c8cd01..24460494f 100644 --- a/windows_docker_resources/Dockerfile.dashing +++ b/windows_docker_resources/Dockerfile.dashing @@ -140,7 +140,6 @@ RUN ""%ProgramFiles%\rti_connext_dds-5.3.1\bin\rtipkginstall.bat" C:\TEMP\connex # Visual Studio Build Tools and .Net SDK` # If the most recent MSVS BuildTools causes new issues, previous releases of BuildTools can be found here: # https://docs.microsoft.com/en-us/visualstudio/releases/2019/history -RUN echo "Temporary echo to purge docker caches for PR #465" ADD https://aka.ms/vs/16/release/vs_BuildTools.exe C:\TEMP\ # 3010 is an acceptable exit code (install was successful but restart required), but it will confuse docker. diff --git a/windows_docker_resources/Dockerfile.foxy b/windows_docker_resources/Dockerfile.foxy index 1871ad30c..a4039804d 100644 --- a/windows_docker_resources/Dockerfile.foxy +++ b/windows_docker_resources/Dockerfile.foxy @@ -140,7 +140,6 @@ RUN ""%ProgramFiles%\rti_connext_dds-5.3.1\bin\rtipkginstall.bat" C:\TEMP\connex # Visual Studio Build Tools and .Net SDK` # If the most recent MSVS BuildTools causes new issues, previous releases of BuildTools can be found here: # https://docs.microsoft.com/en-us/visualstudio/releases/2019/history -RUN echo "Temporary echo to purge docker caches for PR #465" ADD https://aka.ms/vs/16/release/vs_BuildTools.exe C:\TEMP\ # 3010 is an acceptable exit code (install was successful but restart required), but it will confuse docker.