diff --git a/windows-1809/base/Dockerfile b/windows-1809/base/Dockerfile index 8ea2131c6df4b4fda7369072272a1cf90e62d8fb..3f186a87e100d8ecf432b90675bdf7b271ee1795 100644 --- a/windows-1809/base/Dockerfile +++ b/windows-1809/base/Dockerfile @@ -32,20 +32,20 @@ ADD powershell/20-MSVC-15.9.ps1 /Windows/System32/WindowsPowerShell/v1.0/profile COPY qtifwsilent.qs C:/qtifwsilent.qs RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ (New-Object Net.WebClient).DownloadFile('https://download.qt.io/official_releases/qt/5.12/5.12.8/qt-opensource-windows-x86-5.12.8.exe', 'C:/qt.exe'); \ - $env:QT_INSTALL_DIR = 'C:/Qt'; \ + $env:QT_INSTALL_DIR = 'C:/ProgramData/Qt'; \ Add-Content "\"/Windows/System32/drivers/etc/hosts\"" "\"`r`n127.0.0.1 iapi.qt.io`r`n::1 iapi.qt.io\""; \ Start-Process C:/qt.exe -NoNewWindow -Wait -ArgumentList '--verbose --script C:/qtifwsilent.qs'; \ Remove-Item -Force C:/qtifwsilent.qs; \ Remove-Item -Force C:/qt.exe; \ - [Environment]::SetEnvironmentVariable('Qt5_DIR', 'C:/Qt/5.12.8/msvc2017_64', [EnvironmentVariableTarget]::Machine) + [Environment]::SetEnvironmentVariable('Qt5_DIR', 'C:/ProgramData/Qt/5.12.8/msvc2017_64', [EnvironmentVariableTarget]::Machine) RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ (New-Object Net.WebClient).DownloadFile('https://www.baslerweb.com/fp-1551786641/media/downloads/software/pylon_software/Basler_pylon_5.2.0.13457.exe', 'C:/Basler_pylon_5.2.0.13457.exe'); \ - Start-Process C:/Basler_pylon_5.2.0.13457.exe -NoNewWindow -Wait -ArgumentList '/quiet /install=SDKs /targetpath=C:/Pylon5'; \ + Start-Process C:/Basler_pylon_5.2.0.13457.exe -NoNewWindow -Wait -ArgumentList '/quiet /install=SDKs /targetpath=C:/ProgramData/Pylon5'; \ Remove-Item -Force C:/Basler_pylon_5.2.0.13457.exe; \ - [Environment]::SetEnvironmentVariable('Pylon5_DIR', 'C:/Pylon5/Development', [EnvironmentVariableTarget]::Machine); + [Environment]::SetEnvironmentVariable('Pylon5_DIR', 'C:/ProgramData/Pylon5/Development', [EnvironmentVariableTarget]::Machine); -RUN $vcpkg_dir = 'C:/vcpkg'; \ +RUN $vcpkg_dir = 'C:/ProgramData/vcpkg'; \ git clone -b robofish --single-branch https://git.imp.fu-berlin.de/bioroboticslab/robofish/vcpkg.git; \ cd $vcpkg_dir; \ git checkout d61d47c5cac2198bf0262d75742e8a4a38e573d6; \