update dockerfiles, add nginx config

README.md

@@ -89,6 +89,8 @@ The sqtracker client service provides the modern, responsive web interface that
 
 The HTTP proxy allows the client, API, and BitTorrent tracker to all be accessible via a single endpoint.
 
+Traefik is recommended and is configured by default. An Nginx config file is also provided for those that prefer it and the `docker-compose.yml` file contains an Nginx block that can be enabled. 
+
 ### Deploying with Docker compose
 
 The sqtracker platform is designed to be deployed via Docker. Once a configuration file is created, deploying is as simple as running `docker compose up -d` at the root of the project.

api/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16-alpine
+FROM node:16
 ENV NODE_ENV=production
 ENV SENTRY_DSN="https://[email protected]/4504645996576768"
 LABEL org.opencontainers.image.source=https://github.com/tdjsnelling/sqtracker

api/src/utils/validateConfig.js

@@ -1,12 +1,4 @@
 import * as yup from "yup";
-import en from "@sqtracker/client/locales/en.json";
-import es from "@sqtracker/client/locales/es.json";
-import it from "@sqtracker/client/locales/it.json";
-import ru from "@sqtracker/client/locales/ru.json";
-import de from "@sqtracker/client/locales/de.json";
-import zh from "@sqtracker/client/locales/zh.json";
-import eo from "@sqtracker/client/locales/eo.json";
-import fr from "@sqtracker/client/locales/fr.json";
 
 const httpRegex = /http(s)?:\/\/.*/;
 const mongoRegex = /mongodb:\/\/.*/;

client/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16-alpine AS builder
+FROM node:16 AS builder
 ARG SENTRY_AUTH_TOKEN
 ENV NODE_ENV=production
 ENV SENTRY_ORG=tdjsnelling

docker-compose.dev.yml

@@ -17,11 +17,17 @@ services:
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
       - ./traefik.yml:/config/traefik.yml
+#  nginx:
+#    image: "nginx:latest"
+#    container_name: "sq_nginx"
+#    restart: always
+#    ports:
+#      - "80:80"
+#    volumes:
+#      - ./nginx.conf:/etc/nginx/nginx.conf
   database:
     container_name: sq_mongodb
     image: mongo:6.0
-    ports:
-      - "127.0.0.1:27017:27017"
     volumes:
       - ./data:/data/db
   api:

docker-compose.yml

@@ -23,6 +23,14 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
       - ./letsencrypt:/letsencrypt
       - ./traefik.yml:/config/traefik.yml
+#  nginx:
+#    image: "nginx:latest"
+#    container_name: "sq_nginx"
+#    restart: always
+#    ports:
+#      - "80:80"
+#    volumes:
+#      - ./nginx.conf:/etc/nginx/nginx.conf
   database:
     container_name: sq_mongodb
     image: mongo:6.0

nginx.conf

@@ -0,0 +1,36 @@
+events {}
+
+http {
+  server {
+    listen 80;
+    resolver 127.0.0.11;
+
+    location / {
+      proxy_pass http://sq_client:3000;
+      proxy_redirect off;
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Host $server_name;
+    }
+
+    location /api/ {
+      rewrite /api/(.*) /$1 break;
+      proxy_pass http://sq_api:3001;
+      proxy_redirect off;
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Host $server_name;
+    }
+
+    location /sq/ {
+      proxy_pass http://sq_api:3001;
+      proxy_redirect off;
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Host $server_name;
+    }
+  }
+}