diff --git a/Dockerfile b/Dockerfile index 86aeab54a79ceda351ffddb98db3997bffe1524a..d2ffe2cafd779475d2650a20d88e6747a9fce3d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,5 +21,5 @@ RUN npm --version RUN npm install ENTRYPOINT [ "/bin/sh" ] -CMD [ "manage.py runserver 0.0.0.0:8002" ] -EXPOSE 8002 +CMD [ "manage.py runserver 0.0.0.0:8888" ] +EXPOSE 8888 diff --git a/docker-compose.yml b/docker-compose.yml index 537c9fa7e5cc498806b4cf1641568764f1940a72..69626143ef79e033c97b29df520078d225859c31 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,21 +13,21 @@ services: web: build: . expose: - - '8002' + - '8888' entrypoint: bash -c "sleep 5 && python manage.py makemigrations web && python manage.py migrate && python manage.py migrate sessions && python manage.py collectstatic --noinput && echo && echo && echo 'The server will start now...' - && gunicorn -b 0.0.0.0:8002 smash.wsgi:application --access-logfile access.log --error-logfile error.log" + && gunicorn -b 0.0.0.0:8888 smash.wsgi:application --access-logfile access.log --error-logfile error.log" ### To run the server through manage.py, use: - # && python manage.py runserver 0.0.0.0:8002" + # && python manage.py runserver 0.0.0.0:8888" ### To run the verbose tests, uncomment: # python manage.py test -v3" command: "" ports: - - "8002:8002" + - "8888:8888" volumes: - static_files:/tmp/static/ depends_on: diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index c1364344cbe114ca549cff0c6c3f7f5130952124..037089367fc17f6069e74cdd7afe8ff5d317068e 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -43,7 +43,7 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; proxy_redirect off; - proxy_pass http://web:8002; + proxy_pass http://web:8888; } } } diff --git a/docker/nginx/smasch.conf b/docker/nginx/smasch.conf index cf6558156860ff7ed87e2e6cd7f19b7d8a4ce7f0..628208b16bf5f2f043ca508cc5e814c5f1922d1e 100644 --- a/docker/nginx/smasch.conf +++ b/docker/nginx/smasch.conf @@ -46,6 +46,6 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; proxy_redirect off; - proxy_pass http://web:8002; + proxy_pass http://web:8888; } }