Update compose django, Fixed #405

Signed-off-by: Kang HuaiShuai <khs1994@khs1994.com>
pull/413/head
Kang HuaiShuai 2019-07-03 11:47:02 +08:00
parent 59af28af86
commit b9247c16df
No known key found for this signature in database
GPG Key ID: 0A380828B1C243A7
5 changed files with 12 additions and 33 deletions

View File

@ -1 +1,2 @@
django_example
manage.py

View File

@ -6,7 +6,7 @@ services:
web:
build: .
command: python3 manage.py runserver 0.0.0.0:8000
command: python manage.py runserver 0.0.0.0:8000
volumes:
- .:/code
ports:

View File

@ -1,22 +0,0 @@
#!/usr/bin/env python
import os
import sys
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_example.settings")
try:
from django.core.management import execute_from_command_line
except ImportError:
# The above import may fail for some other reason. Ensure that the
# issue is really that Django is missing to avoid masking other
# exceptions on Python 2.
try:
import django
except ImportError:
raise ImportError(
"Couldn't import Django. Are you sure it's installed and "
"available on your PYTHONPATH environment variable? Did you "
"forget to activate a virtual environment?"
)
raise
execute_from_command_line(sys.argv)

View File

@ -1,2 +1,2 @@
Django>=1.8,<2.0
psycopg2
Django>=2.0,<3.0
psycopg2>=2.7,<3.0

View File

@ -13,9 +13,9 @@ FROM python:3
ENV PYTHONUNBUFFERED 1
RUN mkdir /code
WORKDIR /code
ADD requirements.txt /code/
COPY requirements.txt /code/
RUN pip install -r requirements.txt
ADD . /code/
COPY . /code/
```
使 Python `Dockerfile` [](../image/create.md# Dockerfile ) [ Dockerfile 使](../dockerfile/README.md)
@ -23,8 +23,8 @@ ADD . /code/
`requirements.txt`
```bash
Django>=1.8,<2.0
psycopg2
Django>=2.0,<3.0
psycopg2>=2.7,<3.0
```
`docker-compose.yml` 西 web 使 Docker
@ -38,7 +38,7 @@ services:
web:
build: .
command: python3 manage.py runserver 0.0.0.0:8000
command: python manage.py runserver 0.0.0.0:8000
volumes:
- .:/code
ports:
@ -47,15 +47,15 @@ services:
- db
```
[`docker-compose.yml` ](yml_ref.md)
[`docker-compose.yml` ](compose_file.md)
使 `docker-compose run` `Django`
```bash
$ docker-compose run web django-admin.py startproject django_example .
$ docker-compose run web django-admin startproject django_example .
```
Compose 使 `Dockerfile` web 使 `django-admin.py startproject django_example`
web 使 Compose 使 `Dockerfile` web 使 `django-admin startproject django_example`
`Django`