Commit 1d07e183 authored by Markus Mößler's avatar Markus Mößler
Browse files

removed nginx configuration

parent 4a1f77f6

docker-compose.prod.yml

+0 −29
Original line number Diff line number Diff line 
version: '3.8'



services:

  #react-frontend:

  #  build:

  #    context: ./react-frontend

  #    dockerfile: Dockerfile.prod

  #  depends_on:

  #    - tornado-backend

  #  networks:

  #    - app-network      



  tornado-backend:

    build: ./tornado-backend

    command: --db_host=postgres
@@ -32,26 +23,6 @@ services: 
    networks:

      - app-network      



  adminer:

    image: adminer

    ports:

      - 8080:8080

    networks:

      - app-network      



  #nginx:

  #  image: nginx:latest

  #  ports:

  #    - "80:80"

  #  volumes:

  #    - ./react-frontend/my-react-app/build:/usr/share/nginx/html:ro

  #    - ./nginx/nginx.prod.conf:/etc/nginx/nginx.conf:ro

  #  depends_on:

  #    - react-frontend

  #    - tornado-backend

  #  networks:

  #    - app-network



networks:

  app-network:

    driver: bridge

docker-compose.yml

+0 −13
Original line number Diff line number Diff line
@@ -51,19 +51,6 @@ services: 
    networks:

      - app-network      



  nginx:

    image: nginx:latest

    ports:

      - "80:80"

    volumes:

      - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro

      - ./react-frontend/my-react-app/build:/usr/share/nginx/html:ro

    depends_on:

      - react-frontend

      - tornado-backend

    networks:

      - app-network



networks:

  app-network:

    driver: bridge
 
 No newline at end of file

nginx/docker-compose.yml

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
# .



services:



  nginx:

    image: nginx:latest

    ports:

      - "80:80"

    volumes:

      - ../nginx/nginx.prod.static.conf:/etc/nginx/nginx.conf:ro

      - ../react-frontend/my-react-app/build:/usr/share/nginx/html:ro

nginx/nginx.conf

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
 

# nginx/nginx.conf



events { }



http {

    

    upstream react {

        server react-frontend:3000;

    }



    upstream tornado {

        server tornado-backend:8888;

    }



    server {

        # Proxy frontend

        location / {

            proxy_pass http://react;

            proxy_http_version 1.1;

            proxy_set_header Upgrade $http_upgrade;

            proxy_set_header Connection 'upgrade';

            proxy_set_header Host $host;

            proxy_cache_bypass $http_upgrade;

        }



        # Proxy API calls to backend

        location /tornado-backend/ {

            proxy_pass http://tornado;

            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-Proto $scheme;

        }

    }

}

nginx/nginx.prod.conf

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
events { }



http {



    upstream tornado {

        server tornado-backend:8888;

    }



    server {

        listen 80;

        server_name localhost;



        # Serve React frontend build files

        root /usr/share/nginx/html;

        index index.html;



        # Route all frontend paths to index.html (for React Router)

        location / {

            try_files $uri /index.html;

        }



        # Proxy API calls to Tornado backend

        location /tornado-backend/ {

            proxy_pass http://tornado;

            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-Proto $scheme;

        }

    }

}