Merge pull request #2545 from hanhanhan/name_containers

This commit is contained in:
Bruno Alla 2020-04-28 12:47:45 +01:00 committed by GitHub
commit d86bd3280a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 0 deletions

View File

@ -128,6 +128,7 @@ Listed in alphabetical order.
Guilherme Guy `@guilherme1guy`_ Guilherme Guy `@guilherme1guy`_
Hamish Durkin `@durkode`_ Hamish Durkin `@durkode`_
Hana Quadara `@hanaquadara`_ Hana Quadara `@hanaquadara`_
Hannah Lazarus `@hanhanhan`_
Harry Moreno `@morenoh149`_ @morenoh149 Harry Moreno `@morenoh149`_ @morenoh149
Harry Percival `@hjwp`_ Harry Percival `@hjwp`_
Hendrik Schneider `@hendrikschneider`_ Hendrik Schneider `@hendrikschneider`_

View File

@ -154,6 +154,15 @@ django-debug-toolbar
In order for ``django-debug-toolbar`` to work designate your Docker Machine IP with ``INTERNAL_IPS`` in ``local.py``. In order for ``django-debug-toolbar`` to work designate your Docker Machine IP with ``INTERNAL_IPS`` in ``local.py``.
docker
""""""
The ``container_name`` from the yml file can be used to check on containers with docker commands, for example: ::
$ docker logs worker
$ docker top worker
Mailhog Mailhog
~~~~~~~ ~~~~~~~

View File

@ -10,6 +10,7 @@ services:
context: . context: .
dockerfile: ./compose/local/django/Dockerfile dockerfile: ./compose/local/django/Dockerfile
image: {{ cookiecutter.project_slug }}_local_django image: {{ cookiecutter.project_slug }}_local_django
container_name: django
depends_on: depends_on:
- postgres - postgres
{%- if cookiecutter.use_mailhog == 'y' %} {%- if cookiecutter.use_mailhog == 'y' %}
@ -29,6 +30,7 @@ services:
context: . context: .
dockerfile: ./compose/production/postgres/Dockerfile dockerfile: ./compose/production/postgres/Dockerfile
image: {{ cookiecutter.project_slug }}_production_postgres image: {{ cookiecutter.project_slug }}_production_postgres
container_name: postgres
volumes: volumes:
- local_postgres_data:/var/lib/postgresql/data - local_postgres_data:/var/lib/postgresql/data
- local_postgres_data_backups:/backups - local_postgres_data_backups:/backups
@ -38,6 +40,7 @@ services:
mailhog: mailhog:
image: mailhog/mailhog:v1.0.0 image: mailhog/mailhog:v1.0.0
container_name: mailhog
ports: ports:
- "8025:8025" - "8025:8025"
@ -46,10 +49,12 @@ services:
redis: redis:
image: redis:5.0 image: redis:5.0
container_name: redis
celeryworker: celeryworker:
<<: *django <<: *django
image: {{ cookiecutter.project_slug }}_local_celeryworker image: {{ cookiecutter.project_slug }}_local_celeryworker
container_name: celeryworker
depends_on: depends_on:
- redis - redis
- postgres - postgres
@ -62,6 +67,7 @@ services:
celerybeat: celerybeat:
<<: *django <<: *django
image: {{ cookiecutter.project_slug }}_local_celerybeat image: {{ cookiecutter.project_slug }}_local_celerybeat
container_name: celerybeat
depends_on: depends_on:
- redis - redis
- postgres - postgres
@ -74,6 +80,7 @@ services:
flower: flower:
<<: *django <<: *django
image: {{ cookiecutter.project_slug }}_local_flower image: {{ cookiecutter.project_slug }}_local_flower
container_name: flower
ports: ports:
- "5555:5555" - "5555:5555"
command: /start-flower command: /start-flower
@ -86,6 +93,7 @@ services:
context: . context: .
dockerfile: ./compose/local/node/Dockerfile dockerfile: ./compose/local/node/Dockerfile
image: {{ cookiecutter.project_slug }}_local_node image: {{ cookiecutter.project_slug }}_local_node
container_name: node
depends_on: depends_on:
- django - django
volumes: volumes: