diff --git a/docker-compose.yml b/docker-compose.yml index e168162..a72bb82 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,7 +35,7 @@ services: build: context: . dockerfile: ./docker/django - command: src/entrypoint.sh + command: python /app/src/manage.py runserver 0.0.0.0:8000 environment: - DJANGO_SETTINGS_MODULE=newsreader.conf.docker ports: diff --git a/poetry.lock b/poetry.lock index 0681268..8cad374 100644 --- a/poetry.lock +++ b/poetry.lock @@ -219,7 +219,7 @@ description = "A high-level Python Web framework that encourages rapid developme name = "django" optional = false python-versions = ">=3.6" -version = "3.0.5" +version = "3.0.7" [package.dependencies] asgiref = ">=3.2,<4.0" @@ -768,7 +768,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["jaraco.itertools", "func-timeout"] [metadata] -content-hash = "38cc29547dab994d438a7a4082fca9f557acfff59626df37ec9ee9f15ff094a0" +content-hash = "479ed51fef7eb2990163f57ff4255887cd559deea9bb631fd8e3ca81e6939715" python-versions = "^3.7" [metadata.files] @@ -866,8 +866,8 @@ coverage = [ {file = "coverage-5.1.tar.gz", hash = "sha256:f90bfc4ad18450c80b024036eaf91e4a246ae287701aaa88eaebebf150868052"}, ] django = [ - {file = "Django-3.0.5-py3-none-any.whl", hash = "sha256:642d8eceab321ca743ae71e0f985ff8fdca59f07aab3a9fb362c617d23e33a76"}, - {file = "Django-3.0.5.tar.gz", hash = "sha256:d4666c2edefa38c5ede0ec1655424c56dc47ceb04b6d8d62a7eac09db89545c1"}, + {file = "Django-3.0.7-py3-none-any.whl", hash = "sha256:e1630333248c9b3d4e38f02093a26f1e07b271ca896d73097457996e0fae12e8"}, + {file = "Django-3.0.7.tar.gz", hash = "sha256:5052b34b34b3425233c682e0e11d658fd6efd587d11335a0203d827224ada8f2"}, ] django-appconf = [ {file = "django-appconf-1.0.4.tar.gz", hash = "sha256:be58deb54a43d77d2e1621fe59f787681376d3cd0b8bd8e4758ef6c3a6453380"}, diff --git a/pyproject.toml b/pyproject.toml index 047c544..71b5efc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,6 +23,7 @@ requests = "^2.23.0" psycopg2-binary = "^2.8.5" gunicorn = "^20.0.4" python-dotenv = "^0.12.0" +django = ">=3.0.7" [tool.poetry.dev-dependencies] factory-boy = "^2.12.0" diff --git a/src/entrypoint.sh b/src/entrypoint.sh deleted file mode 100755 index 3fbf941..0000000 --- a/src/entrypoint.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -# This file should only be used in conjuction with docker-compose - -python /app/src/manage.py migrate -python /app/src/manage.py runserver 0.0.0.0:8000