Merge pull request #56 from girder/docker-dir

kitware-resonant · Oct 1, 2020 · 58d6ccb · 58d6ccb
2 parents 778f4f5 + a45429c
commit 58d6ccb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/{{ cookiecutter.project_slug }}/dev/django.Dockerfile b/{{ cookiecutter.project_slug }}/dev/django.Dockerfile
@@ -13,7 +13,8 @@ ENV PYTHONUNBUFFERED 1
 # but find_packages() will find nothing (which is fine). When Docker Compose mounts the real source
 # over top of this directory, the .egg-link in site-packages resolves to the mounted directory
 # and all package modules are importable.
-COPY ./setup.py /opt/django/setup.py
-RUN pip install --editable /opt/django[dev]
+COPY ./setup.py /opt/django-project/setup.py
+RUN pip install --editable /opt/django-project[dev]
 
-WORKDIR /opt/django
+# Use a directory name which will never be an import name, as isort considers this as first-party.
+WORKDIR /opt/django-project
diff --git a/{{ cookiecutter.project_slug }}/docker-compose.override.yml b/{{ cookiecutter.project_slug }}/docker-compose.override.yml
@@ -9,7 +9,7 @@ services:
     tty: true
     env_file: ./dev/.env.docker-compose
     volumes:
-      - .:/opt/django
+      - .:/opt/django-project
     ports:
       - 8000:8000
     depends_on:
@@ -31,7 +31,7 @@ services:
     tty: false
     env_file: ./dev/.env.docker-compose
     volumes:
-      - .:/opt/django
+      - .:/opt/django-project
     depends_on:
       - postgres
       - rabbitmq