diff --git a/windows1809/base/Dockerfile b/windows1809/base/Dockerfile index 7e355e13965d7dc1c5f5d96469d82423102942f4..e5c5be563f3249951e00eb65b0a072d24f0b44a6 100644 --- a/windows1809/base/Dockerfile +++ b/windows1809/base/Dockerfile @@ -45,6 +45,6 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl RUN $vcpkg_dir = 'C:/vcpkg'; \ git clone https://git.imp.fu-berlin.de/bioroboticslab/robofish/vcpkg.git $vcpkg_dir; \ cd $vcpkg_dir; \ - git checkout ed03d814da4c8edf09caba90c15741f13f436f9e; \ + git checkout 7d322e995f49d3989fa982268c2d4586c4f8d1f1; \ ./scripts/bootstrap.ps1; \ [Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine); diff --git a/windows1809/cuda-devel/Dockerfile b/windows1809/cuda-devel/Dockerfile index b953efb43bef99311023e078997afd102300577b..80e199d2f78c7ff0de05d8762893758971c74669 100644 --- a/windows1809/cuda-devel/Dockerfile +++ b/windows1809/cuda-devel/Dockerfile @@ -34,7 +34,7 @@ RUN cd $env:VCPKG_DIR; \ harfbuzz \ rpclib \ eigen3 \ - "\"opencv3[cuda,ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \ + "\"opencv4[cuda,ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \ "\"mxnet[cpp,opencv,cuda,cudnn]\""; \ [Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \ [Environment]::SetEnvironmentVariable('CMAKE_TOOLCHAIN_FILE', "\"/vcpkg/scripts/buildsystems/vcpkg.cmake\"", [EnvironmentVariableTarget]::Machine); \ diff --git a/windows1809/devel/Dockerfile b/windows1809/devel/Dockerfile index 36e7e264499c94be4f5f2529b4b105082d20c995..7d7b0e021bea6295f3cea4f617615780bd363124 100644 --- a/windows1809/devel/Dockerfile +++ b/windows1809/devel/Dockerfile @@ -23,7 +23,7 @@ RUN cd $env:VCPKG_DIR; \ harfbuzz \ rpclib \ eigen3 \ - "\"opencv3[ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \ + "\"opencv4[ffmpeg,ximea,opengl,contrib,ipp,dnn]\"" \ "\"mxnet[cpp,opencv]\""; \ [Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \ [Environment]::SetEnvironmentVariable('CMAKE_TOOLCHAIN_FILE', "\"/vcpkg/scripts/buildsystems/vcpkg.cmake\"", [EnvironmentVariableTarget]::Machine); \