diff --git a/core/settings/common.py b/core/settings/common.py index 3ed53783..1d111eab 100644 --- a/core/settings/common.py +++ b/core/settings/common.py @@ -25,7 +25,7 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ['*'] # Application definition diff --git a/docker-compose.yml b/docker-compose.yml index e9c443a8..df673c93 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,8 +9,8 @@ services: - data:/var/lib/postgresql/data/ app: build: . - ports: - - "8000:8000" + expose: + - "8000" depends_on: - db environment: @@ -21,7 +21,7 @@ services: - "8080:80" depends_on: - app - volumes: - - ./frontend/nginx.conf:/etc/nginx/conf.d/default.conf:ro +# volumes: +# - ./frontend/nginx.conf:/etc/nginx/conf.d/default.conf:ro volumes: data: diff --git a/frontend/Dockerfile b/frontend/Dockerfile index fdf89f0d..88ec2880 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -4,4 +4,5 @@ COPY ./ /app RUN yarn && yarn build FROM nginx:alpine -COPY --from=0 /app/dist /usr/share/nginx/html \ No newline at end of file +ADD ./nginx.conf /etc/nginx/conf.d/default.conf +COPY --from=0 /app/dist /usr/share/nginx/html diff --git a/frontend/nginx.conf b/frontend/nginx.conf index 0ceafcfb..bb3ea6ba 100644 --- a/frontend/nginx.conf +++ b/frontend/nginx.conf @@ -18,8 +18,8 @@ server { proxy_pass http://docker-app; 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; + #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; } -} \ No newline at end of file +}