Commit 319df7eb authored by Nikita Chernykh's avatar Nikita Chernykh
Browse files

Merge branch 'STA-931' into 'main' 

STA-931|fix nginx and docker for nginx

See merge request !15
parents 4451e8fc 9dcfabce

docker-compose.yml

+3 −2
Original line number Diff line number Diff line
@@ -14,13 +14,14 @@ services: 
      - '${DB_PORT}:5432'



  nginx:

    image: nginx:1.25.5-alpine

    build:

      context: .

      dockerfile: docker/nginx/Dockerfile

    container_name: ${APP_NAME}-nginx

    ports:

      - '${NGINX_PORT}:80'

    volumes:

      - ./app/public:/app/public

      - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf

    networks:

      - app

    links:

docker/nginx/Dockerfile

0 → 100644
+3 −0
Original line number Diff line number Diff line 
FROM nginx:1.25.5-alpine



COPY docker/nginx/default.conf /etc/nginx/conf.d/default.conf
 
 No newline at end of file

docker/app/Dockerfile.dockerignore

+1 −1

File changed.

Contains only whitespace changes.