diff --git a/ci/windows/Dockerfile b/ci/windows/Dockerfile index c6bfe16fc8..2f00bc856f 100644 --- a/ci/windows/Dockerfile +++ b/ci/windows/Dockerfile @@ -35,23 +35,18 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePoin SHELL ["cmd", "/S", "/C"] # Install prerequisites +RUN choco install powershell-core -y RUN choco install conan -y +RUN choco install sed -y RUN choco install winflexbison -y -RUN choco install openssl -y -RUN choco install python -y # Can't install a proper msys2 because it caused console hanging in the container during docker build. RUN choco install msysgit -y -RUN choco install sed -y -RUN choco install powershell-core -y # Set working environment. RUN setx /M PATH "%PATH%;C:\\Program Files\\Git\\bin" RUN mkdir C:\build WORKDIR C:\build -# Configure conan -ADD default C:\Users\ContainerAdministrator\.conan\profiles\default - # Define the entry point for the docker container. # This entry point starts the developer command prompt and launches the PowerShell shell. ENTRYPOINT ["C:\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat", "&&", "pwsh.exe", "-NoLogo", "-ExecutionPolicy", "Unrestricted"] \ No newline at end of file diff --git a/ci/windows/default b/ci/windows/default deleted file mode 100644 index 620a4bf3a9..0000000000 --- a/ci/windows/default +++ /dev/null @@ -1,12 +0,0 @@ -[settings] -os=Windows -os_build=Windows -arch=x86_64 -arch_build=x86_64 -compiler=Visual Studio -compiler.version=16 -compiler.runtime=MT -build_type=Release -[options] -[build_requires] -[env]