diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 39e05c3f..5f2de471 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -128,6 +128,7 @@ Listed in alphabetical order. Guilherme Guy `@guilherme1guy`_ Hamish Durkin `@durkode`_ Hana Quadara `@hanaquadara`_ + Hannah Lazarus `@hanhanhan`_ Harry Moreno `@morenoh149`_ @morenoh149 Harry Percival `@hjwp`_ Hendrik Schneider `@hendrikschneider`_ diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index 09e68498..d6b4146d 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -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``. +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 ~~~~~~~ diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index 60f8f922..b603f177 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -10,6 +10,7 @@ services: context: . dockerfile: ./compose/local/django/Dockerfile image: {{ cookiecutter.project_slug }}_local_django + container_name: django depends_on: - postgres {%- if cookiecutter.use_mailhog == 'y' %} @@ -29,6 +30,7 @@ services: context: . dockerfile: ./compose/production/postgres/Dockerfile image: {{ cookiecutter.project_slug }}_production_postgres + container_name: postgres volumes: - local_postgres_data:/var/lib/postgresql/data - local_postgres_data_backups:/backups @@ -38,6 +40,7 @@ services: mailhog: image: mailhog/mailhog:v1.0.0 + container_name: mailhog ports: - "8025:8025" @@ -46,10 +49,12 @@ services: redis: image: redis:5.0 + container_name: redis celeryworker: <<: *django image: {{ cookiecutter.project_slug }}_local_celeryworker + container_name: celeryworker depends_on: - redis - postgres @@ -62,6 +67,7 @@ services: celerybeat: <<: *django image: {{ cookiecutter.project_slug }}_local_celerybeat + container_name: celerybeat depends_on: - redis - postgres @@ -74,6 +80,7 @@ services: flower: <<: *django image: {{ cookiecutter.project_slug }}_local_flower + container_name: flower ports: - "5555:5555" command: /start-flower @@ -86,6 +93,7 @@ services: context: . dockerfile: ./compose/local/node/Dockerfile image: {{ cookiecutter.project_slug }}_local_node + container_name: node depends_on: - django volumes: