mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +00:00
Updated windows dockerfile
This commit is contained in:
parent
1b3719cf29
commit
032f0587f4
2 changed files with 2 additions and 19 deletions
|
@ -35,23 +35,18 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePoin
|
||||||
SHELL ["cmd", "/S", "/C"]
|
SHELL ["cmd", "/S", "/C"]
|
||||||
|
|
||||||
# Install prerequisites
|
# Install prerequisites
|
||||||
|
RUN choco install powershell-core -y
|
||||||
RUN choco install conan -y
|
RUN choco install conan -y
|
||||||
|
RUN choco install sed -y
|
||||||
RUN choco install winflexbison -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.
|
# 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 msysgit -y
|
||||||
RUN choco install sed -y
|
|
||||||
RUN choco install powershell-core -y
|
|
||||||
|
|
||||||
# Set working environment.
|
# Set working environment.
|
||||||
RUN setx /M PATH "%PATH%;C:\\Program Files\\Git\\bin"
|
RUN setx /M PATH "%PATH%;C:\\Program Files\\Git\\bin"
|
||||||
RUN mkdir C:\build
|
RUN mkdir C:\build
|
||||||
WORKDIR C:\build
|
WORKDIR C:\build
|
||||||
|
|
||||||
# Configure conan
|
|
||||||
ADD default C:\Users\ContainerAdministrator\.conan\profiles\default
|
|
||||||
|
|
||||||
# Define the entry point for the docker container.
|
# Define the entry point for the docker container.
|
||||||
# This entry point starts the developer command prompt and launches the PowerShell shell.
|
# 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"]
|
ENTRYPOINT ["C:\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat", "&&", "pwsh.exe", "-NoLogo", "-ExecutionPolicy", "Unrestricted"]
|
|
@ -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]
|
|
Loading…
Add table
Add a link
Reference in a new issue