set entrypoint instead of command

master
JoYo 2021-02-19 15:50:01 -05:00
parent 098eeaa2f2
commit fe3b8ded68
4 changed files with 5 additions and 5 deletions

View File

@ -13,4 +13,4 @@ RUN C:\docker\vs_buildtools.exe --quiet --wait --norestart --nocache `
VOLUME C:\source\ VOLUME C:\source\
WORKDIR C:\source\ WORKDIR C:\source\
CMD ["powershell", "-NoExit", "-Command", "Import-Module C:\\msvc\\Common7\\Tools\\Microsoft.VisualStudio.DevShell.dll;", "Enter-VsDevShell -VsInstallPath C:\\msvc\\ -DevCmdArguments -arch=amd64"] ENTRYPOINT ["powershell", "-NoExit", "-Command", "Import-Module C:\\msvc\\Common7\\Tools\\Microsoft.VisualStudio.DevShell.dll;", "Enter-VsDevShell -VsInstallPath C:\\msvc\\"]

View File

@ -73,7 +73,7 @@ docker-compose run win_build
This will drop you into the visual studio developer shell or console for winxp. This will drop you into the visual studio developer shell or console for winxp.
To modify the developer shell environments replace `command:` in your `docker-compose.yaml` with the desired environment variables or scripted build commands. To modify the developer shell environments replace `entrypoint:` in your `docker-compose.yaml` with the desired environment variables or scripted build commands.
```yaml ```yaml
version: '3' version: '3'
@ -83,7 +83,7 @@ services:
image: win_build image: win_build
volumes: volumes:
- .:C:/source/ - .:C:/source/
command: powershell -Command Import-Module C:\\msvc\\Common7\\Tools\\Microsoft.VisualStudio.DevShell.dll; Enter-VsDevShell -VsInstallPath C:\\msvc\\ entrypoint: powershell -Command Import-Module C:\\msvc\\Common7\\Tools\\Microsoft.VisualStudio.DevShell.dll; Enter-VsDevShell -VsInstallPath C:\\msvc\\ -DevCmdArguments -arch=amd64
``` ```
# Optional Workstation Scripts # Optional Workstation Scripts

View File

@ -4,7 +4,7 @@ FROM win_build
ADD https://win.rustup.rs C:\docker\rustup-init.exe ADD https://win.rustup.rs C:\docker\rustup-init.exe
RUN C:\docker\rustup-init.exe --quiet -y RUN C:\docker\rustup-init.exe --quiet -y
RUN setx path "%path%;C:\Users\ContainerAdministrator\.cargo\bin" RUN setx path "%path%;%USERPROFILE%\.cargo\bin"
VOLUME C:\source\ VOLUME C:\source\
WORKDIR C:\source\ WORKDIR C:\source\

View File

@ -13,4 +13,4 @@ RUN C:\docker\vs_buildtools.exe --quiet --wait --norestart --nocache `
VOLUME C:\source\ VOLUME C:\source\
WORKDIR C:\source\ WORKDIR C:\source\
CMD ["cmd", "/k C:\\msvc\\Common7\\Tools\\VsDevCmd.bat"] ENTRYPOINT ["cmd", "/k C:\\msvc\\Common7\\Tools\\VsDevCmd.bat"]