From db2ece4b58d15d259f53afd0a2dc52d859d1c0b4 Mon Sep 17 00:00:00 2001
From: Veaceslav Doina <20563034+veaceslavdoina@users.noreply.github.com>
Date: Fri, 1 Dec 2023 10:09:20 +0200
Subject: [PATCH] Fix Nginx template loading (#10)

---
 docker/Dockerfile       |  7 +++----
 docker/build-docker.bat | 11 ++++++-----
 docker/nginx.template   | 22 +++++++++++++++-------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8c349fc..ec22d8e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -27,7 +27,6 @@ ARG APP_USER
 ARG APP_HOME
 ARG NGINX_TEMPLATE
 
-COPY --from=builder ${APP_HOME}/build /usr/share/nginx/html
-COPY ${NGINX_TEMPLATE} /etc/nginx/nginx.template
-
-ENTRYPOINT ["nginx", "-g", "daemon off;"]
+RUN mkdir /etc/nginx/templates
+COPY ${NGINX_TEMPLATE} /etc/nginx/templates/default.conf.template
+COPY --chown=${APP_USER}:${APP_USER} --from=builder ${APP_HOME}/build /usr/share/nginx/html
diff --git a/docker/build-docker.bat b/docker/build-docker.bat
index 7d4e4c1..cfecdf8 100644
--- a/docker/build-docker.bat
+++ b/docker/build-docker.bat
@@ -1,8 +1,9 @@
 :: Variables
-set repository=thatbenbierens/codex-frontend
-set tag=initial
-set app_src=../frontend
+set REPOSITORY=thatbenbierens/codex-frontend
+set TAG=initial
+set APP_SRC=../frontend
+set NGINX_TEMPLATE=docker/nginx.template
 
 :: Build
-docker build --build-arg APP_SRC=%app_src% -t %repository%:%tag% .
-docker push %repository%:%tag%
+docker build --build-arg APP_SRC=%APP_SRC% --build-arg NGINX_TEMPLATE=%NGINX_TEMPLATE% -t %REPOSITORY%:%TAG% .
+docker push %REPOSITORY%:%TAG%
diff --git a/docker/nginx.template b/docker/nginx.template
index 1518601..ac79fa5 100644
--- a/docker/nginx.template
+++ b/docker/nginx.template
@@ -1,11 +1,24 @@
-server
-{
+log_format custom
+  '$remote_addr - $request_time - [$time_local] - $msec - '
+  '$request_id - $connection-$connection_requests - '
+  '$scheme - $host - $server_port - '
+  '$request_method - $request_uri - $server_protocol - $status - $request_completion - '
+  '$bytes_sent - $request_length - "$http_referer" - "$http_user_agent" - '
+  '$proxy_host - "$upstream_addr" - "$upstream_status" - "$upstream_connect_time" - "$upstream_response_time" ';
+
+server {
     listen       80;
     server_name  localhost;
 
     root   /usr/share/nginx/html;
     index       index.html;
     error_page  500 502 503 504  /50x.html;
+    access_log  /var/log/nginx/access.log  custom;
+
+    location / {
+        try_files   $uri  /index.html;
+        add_header  Cache-Control  "no-cache";
+    }
 
     location /api {
         proxy_pass                           $codex_url;
@@ -14,9 +27,4 @@ server
         proxy_set_header  X-Forwarded-For    $proxy_add_x_forwarded_for;
         proxy_set_header  X-Forwarded-Proto  $scheme;
     }
-
-    location / {
-        try_files   $uri  /index.html;
-        add_header  Cache-Control  "no-cache";
-    }
 }