Fixing PATH in various host-process containers (#210)

Signed-off-by: Mark Rossetti <[email protected]>
kubernetes-sigs · Mar 10, 2022 · 67084a0 · 67084a0
1 parent 5cc90c6
commit 67084a0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/hostprocess/calico/install/Dockerfile.install b/hostprocess/calico/install/Dockerfile.install
@@ -12,7 +12,7 @@ RUN unzip cni.zip
 
 FROM $BASE
 
-ENV PATH="C:\Program Files\PowerShell;C:\utils;C:\Windows\system32;C:\Windows;"
+ENV PATH="C:\Windows\system32;C:\Windows;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;"
 
 COPY --from=bins /cni/CalicoWindows/cni/calico.exe /calico/cni/calico.exe
 COPY --from=bins /cni/CalicoWindows/cni/calico-ipam.exe /calico/cni/calico-ipam.exe

diff --git a/hostprocess/calico/kube-proxy/Dockerfile b/hostprocess/calico/kube-proxy/Dockerfile
@@ -12,9 +12,9 @@ RUN curl -LO https://raw.githubusercontent.com/microsoft/SDN/master/Kubernetes/w
 
 FROM $BASE
 
-ENV PATH="C:\Program Files\PowerShell;C:\utils;C:\Windows\system32;C:\Windows;"
+ENV PATH="C:\Windows\system32;C:\Windows;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;"
 
-Add start.ps1 /kube-proxy/start.ps1
+ADD start.ps1 /kube-proxy/start.ps1
 COPY --from=bins /kube-proxy/kube-proxy.exe /kube-proxy/kube-proxy.exe
 COPY --from=bins /kube-proxy/hns.psm1 /kube-proxy/hns.psm1
 

diff --git a/hostprocess/calico/node/Dockerfile.node b/hostprocess/calico/node/Dockerfile.node
@@ -12,7 +12,7 @@ RUN unzip cni.zip
 
 FROM $BASE
 
-ENV PATH="C:\Program Files\PowerShell;C:\utils;C:\Windows\system32;C:\Windows;"
+ENV PATH="C:\Windows\system32;C:\Windows;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;"
 
 WORKDIR /calico
 COPY --from=bins /cni/CalicoWindows/calico-node.exe /calico

diff --git a/hostprocess/flannel/flanneld/Dockerfile b/hostprocess/flannel/flanneld/Dockerfile
@@ -26,7 +26,7 @@ RUN curl -Lo flanneld.exe https://github.com/coreos/flannel/releases/download/${
 
 FROM $BASE
 
-ENV PATH="C:\Program Files\PowerShell;C:\utils;C:\Windows\system32;C:\Windows;"
+ENV PATH="C:\Windows\system32;C:\Windows;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;"
 
 ADD https://raw.githubusercontent.com/microsoft/SDN/master/Kubernetes/windows/hns.psm1 /flannel/hns.psm1
 COPY start.ps1 /flannel/start.ps1

diff --git a/hostprocess/flannel/kube-proxy/Dockerfile b/hostprocess/flannel/kube-proxy/Dockerfile
@@ -12,9 +12,9 @@ RUN curl -LO https://raw.githubusercontent.com/microsoft/SDN/master/Kubernetes/w
 
 FROM $BASE
 
-ENV PATH="C:\Program Files\PowerShell;C:\utils;C:\Windows\system32;C:\Windows;"
+ENV PATH="C:\Windows\system32;C:\Windows;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;"
 
-Add start.ps1 /kube-proxy/start.ps1
+ADD start.ps1 /kube-proxy/start.ps1
 COPY --from=bins /kube-proxy /kube-proxy
 
 ENTRYPOINT ["PowerShell", "/c", "$env:CONTAINER_SANDBOX_MOUNT_POINT/kube-proxy/start.ps1"]