From 17fcda15c5c47b2f4c67f2c3ee93b76200019303 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Wed, 24 Feb 2021 10:58:38 +0000 Subject: [PATCH] test images: Fixes Windows nginx images entrypoints nginx expects to find its conf and logs folder locally, and fails if it cannot find them. cd-ing into the the nginx folder solves this issue. This is a similar approach to the echoserver image, which also uses nginx. --- test/images/nginx-new/Dockerfile_windows | 2 +- test/images/nginx-new/VERSION | 2 +- test/images/nginx/Dockerfile_windows | 2 +- test/images/nginx/VERSION | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/images/nginx-new/Dockerfile_windows b/test/images/nginx-new/Dockerfile_windows index e0f5468cfe6..0ba3744716c 100644 --- 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"] diff --git a/test/images/nginx-new/VERSION b/test/images/nginx-new/VERSION index 37a2c9f9f06..15e3ee1056e 100644 --- a/test/images/nginx-new/VERSION +++ b/test/images/nginx-new/VERSION @@ -1 +1 @@ -1.15-alpine +1.15-1 diff --git a/test/images/nginx/Dockerfile_windows b/test/images/nginx/Dockerfile_windows index 0111eadb1bd..426df1e2569 100644 --- 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"] diff --git a/test/images/nginx/VERSION b/test/images/nginx/VERSION index 5b39ae96385..74be6038114 100644 --- a/test/images/nginx/VERSION +++ b/test/images/nginx/VERSION @@ -1 +1 @@ -1.14-alpine +1.14-1