Handle custom commands for the ENTRYPOINT

jfahrer · jfahrer · commit 334b03e297eb · 2018-05-04T17:32:33.000-07:00
[refs #987ed18a61e7]
diff --git a/entrypoints/nginx/Dockerfile b/entrypoints/nginx/Dockerfile
@@ -6,3 +6,4 @@ COPY default.conf /etc/nginx/conf.d/default.conf
 COPY docker-entrypoint.sh /
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/entrypoints/nginx/docker-entrypoint.sh b/entrypoints/nginx/docker-entrypoint.sh
@@ -2,4 +2,4 @@
 mv /etc/nginx/conf.d/default.conf /tmp/default.conf
 envsubst < /tmp/default.conf > /etc/nginx/conf.d/default.conf
 
-nginx -t
+exec "$@"

Original file line number	Diff line number	Diff line change
`@@ -6,3 +6,4 @@ COPY default.conf /etc/nginx/conf.d/default.conf`
`6`	`6`	`COPY docker-entrypoint.sh /`
`7`	`7`
`8`	`8`	`ENTRYPOINT ["/docker-entrypoint.sh"]`
	`9`	`+CMD ["nginx", "-g", "daemon off;"]`