diff --git a/docker-compose.yml b/docker-compose.yml index 43245e3..9da577e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: nginx: image: nginx:1.13 ports: - - 8080:8080 + - 8008:80 volumes: - ./nginx.conf:/etc/nginx/conf.d/default.conf - static_volume:/comixify/static diff --git a/dockerfile b/dockerfile index b081dec..c88a9c7 100644 --- a/dockerfile +++ b/dockerfile @@ -2,7 +2,7 @@ FROM nvidia/cuda:9.0-cudnn7-runtime RUN apt-get update && apt-get install -y apt-utils software-properties-common && \ add-apt-repository ppa:jonathonf/python-3.6 && \ - apt-get update && apt-get -y install python3 python3-pip python3.6 python3.6-dev python3-pip python3.6-venv vim ffmpeg \ + apt-get update && apt-get -y install python3 python3-pip python3.6 python3.6-dev python3.6-venv vim ffmpeg \ build-essential cmake git libgtk2.0-dev pkg-config libavcodec-dev \ libavformat-dev libswscale-dev && \ python3.6 -m pip install --upgrade pip && \ @@ -16,7 +16,7 @@ COPY . /comixify RUN python3.6 -m pip install -r requirements.txt # Port to expose -EXPOSE 8080 +EXPOSE 8008 ENTRYPOINT ["sh", "entrypoint.sh"] CMD ['start'] diff --git a/entrypoint.sh b/entrypoint.sh index 4007f19..fbe4e5d 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/sh start (){ - gunicorn --bind :8080 settings.wsgi:application --timeout 300 + gunicorn --bind :8008 settings.wsgi:application --timeout 300 } migrate (){ diff --git a/nginx.conf b/nginx.conf index 8fcfb57..7ddbac3 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,12 +1,10 @@ upstream hello_server { - server web:8080; + server web:8008; } server { - listen 8080; + listen 80; server_name localhost; - access_log /var/log/nginx/app.log; - error_log /var/log/nginx/error.log; client_max_body_size 50M; location / { # everything is passed to Gunicorn