From fe3b8ded68b80672ca49e72d3dbf87b9ef25b71e Mon Sep 17 00:00:00 2001
From: JoYo <>
Date: Fri, 19 Feb 2021 15:50:01 -0500
Subject: [PATCH] set entrypoint instead of command

---
 Dockerfile       | 2 +-
 README.mdown     | 4 ++--
 rust.Dockerfile  | 2 +-
 winxp.Dockerfile | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 78b93f9..2b17ea2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,4 +13,4 @@ RUN C:\docker\vs_buildtools.exe --quiet --wait --norestart --nocache `
 
 VOLUME 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\\"]
diff --git a/README.mdown b/README.mdown
index 882043f..0f2d4ee 100644
--- a/README.mdown
+++ b/README.mdown
@@ -73,7 +73,7 @@ docker-compose run win_build
 
 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
 version: '3'
@@ -83,7 +83,7 @@ services:
     image: win_build
     volumes:
       - .: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
diff --git a/rust.Dockerfile b/rust.Dockerfile
index 7e312d8..0882b3c 100644
--- a/rust.Dockerfile
+++ b/rust.Dockerfile
@@ -4,7 +4,7 @@ FROM win_build
 ADD https://win.rustup.rs C:\docker\rustup-init.exe
 
 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\
 WORKDIR C:\source\
diff --git a/winxp.Dockerfile b/winxp.Dockerfile
index 243b1e8..47b60c5 100644
--- a/winxp.Dockerfile
+++ b/winxp.Dockerfile
@@ -13,4 +13,4 @@ RUN C:\docker\vs_buildtools.exe --quiet --wait --norestart --nocache `
 
 VOLUME C:\source\
 WORKDIR C:\source\
-CMD ["cmd", "/k C:\\msvc\\Common7\\Tools\\VsDevCmd.bat"]
+ENTRYPOINT ["cmd", "/k C:\\msvc\\Common7\\Tools\\VsDevCmd.bat"]