Merge commit '833a79ff3c4b35dc4cdeff7b0de6582dd3f34ec2'

This commit is contained in:
Trung Dong Huynh 2017-08-31 23:58:26 +01:00
commit 196a34d60c
5 changed files with 0 additions and 21 deletions

View File

@ -25,14 +25,6 @@ Switch to *Docker Compose* and select `local.yml` file from directory of your pr
.. image:: images/4.png .. image:: images/4.png
Because Pycharm restarts container every time you use Configuration Run, to not have server restarted during running tests, we defined second service in `local.yml` file called pycharm. To use it, you have to add interpreter of second service as well.
.. image:: images/5.png
The final result should be:
.. image:: images/6.png
Having that, click *OK*. Close *Settings* panel, and wait few seconds... Having that, click *OK*. Close *Settings* panel, and wait few seconds...
.. image:: images/7.png .. image:: images/7.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 67 KiB

View File

@ -28,18 +28,6 @@ services:
- postgres_backup_dev:/backups - postgres_backup_dev:/backups
environment: environment:
- POSTGRES_USER={{cookiecutter.project_slug}} - POSTGRES_USER={{cookiecutter.project_slug}}
{% if cookiecutter.use_pycharm == 'y' %}
pycharm:
build:
context: .
dockerfile: ./compose/django/Dockerfile-local
depends_on:
- postgres
environment:
- POSTGRES_USER={{cookiecutter.project_slug}}
volumes:
- .:/app
{% endif %}
{% if cookiecutter.use_mailhog == 'y' %} {% if cookiecutter.use_mailhog == 'y' %}
mailhog: mailhog:
image: mailhog/mailhog:v1.0.0 image: mailhog/mailhog:v1.0.0

View File

@ -16,7 +16,6 @@ whitenoise==3.3.0
# Forms # Forms
django-braces==1.11.0
django-crispy-forms==1.6.1 django-crispy-forms==1.6.1
# Models # Models