From 781f89b93f3ea9e70db48a8d3485212887c10516 Mon Sep 17 00:00:00 2001
From: Eric Doughty-Papassideris <eric.dp@drentec.com>
Date: Wed, 6 Mar 2024 10:07:54 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20tdrive-frontend=20Dockerfile:=20?=
 =?UTF-8?q?migrate=20to=20alpine,=20typo=20in=20entrypoint.sh,=20accept=20?=
 =?UTF-8?q?any=20host=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdrive/docker/tdrive-frontend/Dockerfile    | 2 +-
 tdrive/docker/tdrive-frontend/entrypoint.sh | 2 +-
 tdrive/docker/tdrive-frontend/redirect.conf | 4 ++--
 tdrive/docker/tdrive-frontend/site.conf     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tdrive/docker/tdrive-frontend/Dockerfile b/tdrive/docker/tdrive-frontend/Dockerfile
index 496be1ae..24e3ce5c 100755
--- a/tdrive/docker/tdrive-frontend/Dockerfile
+++ b/tdrive/docker/tdrive-frontend/Dockerfile
@@ -1,5 +1,5 @@
 # First stage: building frontend
-FROM node:lts AS build
+FROM node:lts-alpine AS build
 
 RUN yarn global add webpack webpack-cli
 COPY frontend /tdrive-react/
diff --git a/tdrive/docker/tdrive-frontend/entrypoint.sh b/tdrive/docker/tdrive-frontend/entrypoint.sh
index 5ac8cbb4..5bccc23d 100755
--- a/tdrive/docker/tdrive-frontend/entrypoint.sh
+++ b/tdrive/docker/tdrive-frontend/entrypoint.sh
@@ -32,7 +32,7 @@ case $SSL_CERTS in
     sed -i '/ *ssl_/d' /etc/nginx/sites-available/site.template
     ;;
   *)
-    echo: "SSL_CERTS var not defined setting selfsigned"
+    echo "SSL_CERTS var not defined setting selfsigned"
     export SSL_CERTS=selfsigned
     _selfsigned
     ;;
diff --git a/tdrive/docker/tdrive-frontend/redirect.conf b/tdrive/docker/tdrive-frontend/redirect.conf
index 78d040a0..9259c4a6 100644
--- a/tdrive/docker/tdrive-frontend/redirect.conf
+++ b/tdrive/docker/tdrive-frontend/redirect.conf
@@ -1,7 +1,7 @@
 server {
   listen 80;
-  server_name localhost;
+  server_name _;
   location / {
-    return 302 https://$server_name$request_uri;
+    return 302 https://$host$request_uri;
   }
 }
diff --git a/tdrive/docker/tdrive-frontend/site.conf b/tdrive/docker/tdrive-frontend/site.conf
index 2e7ba72d..335efee3 100644
--- a/tdrive/docker/tdrive-frontend/site.conf
+++ b/tdrive/docker/tdrive-frontend/site.conf
@@ -4,7 +4,7 @@ server {
   ssl_certificate /etc/nginx/ssl/selfsigned.crt;
   ssl_certificate_key /etc/nginx/ssl/selfsigned.key;
 
-  server_name localhost;
+  server_name _;
   root /tdrive-core/web;
 
   add_header Strict-Transport-Security "max-age=31536000";