Merge pull request #99395 from claudiubelu/test-images/fixes-windows-nginx-entrypoints

test images: Fixes Windows nginx images entrypoints
2021-02-24 06:38:49 -08:00
parent 4cc1127e92 17fcda15c5
commit 7322dff5b5
4 changed files with 4 additions and 4 deletions
--- a/test/images/nginx-new/Dockerfile_windows
+++ b/test/images/nginx-new/Dockerfile_windows
@@ -24,4 +24,4 @@ COPY --from=nginx-source /nginx /usr/share/nginx

 USER ContainerAdministrator
 EXPOSE 80
-ENTRYPOINT ["/usr/share/nginx/nginx.exe"]
+ENTRYPOINT ["/bin/sh", "-c", " cd /usr/share/nginx && ./nginx.exe"]
--- a/test/images/nginx-new/VERSION
+++ b/test/images/nginx-new/VERSION
@@ -1 +1 @@
-1.15-alpine
+1.15-1
--- a/test/images/nginx/Dockerfile_windows
+++ b/test/images/nginx/Dockerfile_windows
@@ -24,4 +24,4 @@ COPY --from=nginx-source /nginx /usr/share/nginx

 USER ContainerAdministrator
 EXPOSE 80
-ENTRYPOINT ["/usr/share/nginx/nginx.exe"]
+ENTRYPOINT ["/bin/sh", "-c", " cd /usr/share/nginx && ./nginx.exe"]
--- a/test/images/nginx/VERSION
+++ b/test/images/nginx/VERSION
@@ -1 +1 @@
-1.14-alpine
+1.14-1