Added nginx.

Author: dsuhoi

README.md

@@ -7,4 +7,4 @@ docker compose up -v --built
 ```
 
 ### Просмотр
-Перейдите по адресу `0.0.0.0:3001/` для просмотра карты с грузами и машинами или `0.0.0.0:8001/docs/` для работы с API сервиса.
+Перейдите по адресу `0.0.0.0:8083/` для просмотра карты с грузами и машинами или `0.0.0.0:8001/docs/` для работы с API сервиса.

backend/.dockerignore

@@ -0,0 +1,13 @@
+# Git
+.git
+.gitignore
+
+# Byte-compiled / optimized / DLL files
+**/__pycache__/
+**/*.py[cod]
+
+# Python
+.env
+.venv/
+venv/
+env/

backend/Dockerfile

@@ -5,11 +5,12 @@ WORKDIR /backend_app
 RUN apt-get update && apt-get install -y libpq-dev netcat
 RUN pip3 install poetry
 
-COPY *.py locations.csv pytest.ini poetry.lock pyproject.toml ./
-COPY core/ ./core/
-COPY routers/ ./routers/
-COPY tasks/ ./tasks/
-COPY tests/ ./tests/
+COPY . .
+# COPY *.py locations.csv pytest.ini poetry.lock pyproject.toml ./
+# COPY core/ ./core/
+# COPY routers/ ./routers/
+# COPY tasks/ ./tasks/
+# COPY tests/ ./tests/
 
 RUN poetry config virtualenvs.create false \
 && poetry install --no-interaction --no-ansi

backend/poetry.lock

@@ -2,7 +2,7 @@
 name = "backend"
 version = "1.1.0"
 description = "Сервис поиска ближайших машин для перевозки грузов."
-authors = ["dsuhoi <dsuh0i.h8@gmail.com>"]
+authors = ["Dan Sukhorukov <dsuh0i.h8@gmail.com>"]
 license = "MIT"
 readme = "README.md"
 
@@ -17,7 +17,7 @@ celery = "^5.3.1"
 uvicorn = "^0.22.0"
 pydantic = "^2.0.2"
 pydantic-settings = "^2.0.1"
-sqlalchemy = "^2.0.18"
+sqlalchemy = "^1.4.44"
 pandas = "^2.0.3"
 strawberry-graphql = {extras = ["fastapi"], version = "^0.194.4"}
 geoalchemy2 = "^0.14.0"

backend/pyproject.toml

@@ -52,6 +52,14 @@ services:
       - ./.env
     depends_on:
       - backend
-
+  nginx:
+    image: nginx:alpine
+    ports:
+      - 8083:8080
+    volumes:
+      - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+    depends_on:
+      - backend
+      - frontend
 volumes:
   postgres_data:

docker-compose.yml

@@ -1,18 +1,13 @@
-# pull official base image
 FROM node:13.12.0-alpine
 
-# set working directory
 WORKDIR /frontend_app
 
-# add `/app/node_modules/.bin` to $PATH
 ENV PATH /app/node_modules/.bin:$PATH
 
-# install app dependencies
 COPY package.json package-lock.json ./
 COPY src/ ./src/
 COPY public/ ./public/
 
 RUN npm install
 
-# start app
 CMD ["npm", "start"]

frontend/Dockerfile

@@ -67,7 +67,7 @@ const MapComponent = () => {
         map.on("pointermove", (event) => {
             const feature = map.forEachFeatureAtPixel(
                 event.pixel,
-                (feature) => feature
+                (feature) => feature,
             );
             if (feature) {
                 const coordinate = event.coordinate;
@@ -83,7 +83,7 @@ const MapComponent = () => {
         });
 
         const client = new ApolloClient({
-            uri: "http://0.0.0.0:8001/graphql",
+            uri: "/api/graphql",
             cache: new InMemoryCache(),
         });
 
@@ -113,7 +113,7 @@ const MapComponent = () => {
                 data.cars.forEach((item) => {
                     const marker = new Feature({
                         geometry: new Point(
-                            fromLonLat([item.loc.lng, item.loc.lat])
+                            fromLonLat([item.loc.lng, item.loc.lat]),
                         ),
                         name: item.carNumber,
                         description: "car",
@@ -126,7 +126,10 @@ const MapComponent = () => {
                 data.cargo.forEach((item) => {
                     const marker = new Feature({
                         geometry: new Point(
-                            fromLonLat([item.pickUpLoc.lng, item.pickUpLoc.lat])
+                            fromLonLat([
+                                item.pickUpLoc.lng,
+                                item.pickUpLoc.lat,
+                            ]),
                         ),
                         name: item.id,
                         description: item.description,

frontend/nginx.conf

@@ -0,0 +1,32 @@
+worker_processes 1;
+
+events { worker_connections 1024; }
+
+http {
+    sendfile on;
+
+    gzip on;
+    gzip_http_version 1.1;
+    gzip_disable      "MSIE [1-6]\.";
+
+    upstream frontend {
+        server frontend:3001;
+    }
+
+    upstream backend {
+        server backend:8001;
+    }
+
+    server {
+        listen 8080;
+
+        location / {
+            proxy_pass http://frontend;
+        }
+
+        location /api {
+            rewrite /api/(.*) /$1 break;
+            proxy_pass http://backend;
+        }
+    }
+}