Merge branch 'master' into develop

amcclain · amcclain · commit c67619d282e5 · 2023-06-16T08:34:56.000-07:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:latest
+FROM nginx:1.23.4
 
 # Top-level config file, defaulted to the one shipped by the official nginx image. That default
 # config will include all sub-configs in $XH_NGINX_CONFIG_PATH. Apps can use this default file and

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM nginx:latest`
	`1`	`+FROM nginx:1.23.4`
`2`	`2`
`3`	`3`	`# Top-level config file, defaulted to the one shipped by the official nginx image. That default`
`4`	`4`	`# config will include all sub-configs in $XH_NGINX_CONFIG_PATH. Apps can use this default file and`