From bdf44fdf84cbdf49270e442904f275811b7ec641 Mon Sep 17 00:00:00 2001 From: "a.shamavov" Date: Thu, 2 May 2024 11:54:21 +0500 Subject: [PATCH] =?UTF-8?q?STA-930=20|=20=D0=9F=D0=B5=D1=80=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D1=81=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8E=20nginx=20=D0=B2=20Dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yaml | 5 ++--- docker/nginx/Dockerfile | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index b41d486..a4e3a36 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -9,7 +9,7 @@ services: POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_HOST_AUTH_METHOD: trust ports: - - "${DATABASE_PORT}:${DATABASE_PORT}" + - "${DATABASE_PORT}:5432" networks: - internal nginx: @@ -20,9 +20,8 @@ services: APP_BASE_DIR: ${APP_BASE_DIR-.} volumes: - ".:/app" - - './docker/nginx/default.conf:/etc/nginx/conf.d/default.conf' ports: - - '${NGINX_PORT}:${NGINX_PORT}' + - '${NGINX_PORT}:80' networks: - internal app: diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 4ea2c80..085ae36 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -4,3 +4,4 @@ WORKDIR "/app" ARG APP_BASE_DIR COPY $APP_BASE_DIR . +RUN cp docker/nginx/default.conf /etc/nginx/conf.d/default.conf \ No newline at end of file -- GitLab