Skip to content

Revert PR 462 and unpin version of MSVS #465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brawner merged 2 commits into from
Jun 4, 2020
Merged

Revert PR 462 and unpin version of MSVS #465

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0723384
Revert PR 462 and unpin version of MSVS
brawner Jun 3, 2020
f214770
Remove echo
brawner Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions windows_docker_resources/Dockerfile.dashing
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions windows_docker_resources/Dockerfile.foxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down