Merge pull request #224 from OCHA-DAP/dev

PR for dev into prod
OCHA-DAP · Aug 12, 2024 · 2f2e3bd · 2f2e3bd
2 parents 4459927 + b1fdb17
commit 2f2e3bd
Show file tree

Hide file tree

Showing 9 changed files with 3,426 additions and 1,727 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/unocha/nodejs-builder:16-alpine AS builder
+FROM public.ecr.aws/unocha/nodejs-builder:20-alpine AS builder
 
 ARG BASE_HREF=/tools/quickcharts
 ARG BUILD_ENV=production

diff --git a/build/hxl-preview-ng-lib-3.2.2.tgz b/build/hxl-preview-ng-lib-3.2.2.tgz
diff --git a/docker/default.conf.tpl b/docker/default.conf.tpl
@@ -2,6 +2,8 @@ server {
 	listen 80 default_server;
 	listen [::]:80 default_server;
 
+  access_log /var/log/nginx/access.log logstash_internal;
+
 	# Everything is a 404
 	location / {
 		return 404;
@@ -18,4 +20,3 @@ server {
 		index index.html;
 	}
 }
-