fix local development when using it downstream

dkyanakiev · Sep 15, 2017 · fe774fc · fe774fc
1 parent 3968e14
commit fe774fc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,14 +1,13 @@
 dev:
   build: .
   dockerfile: Dockerfile
-  command: local
+  command: /usr/local/service/estate/local.sh
   ports:
     - 8000:8000
     - 3000:3000
   volumes:
     - $PWD/estate:/usr/local/service/estate
     - $PWD/webpack:/usr/local/service/webpack
-    - $PWD/scripts/local.sh:/usr/bin/local
     - /var/run/docker.sock:/var/run/docker.sock
     - /tmp:/tmp
   environment:

diff --git a/scripts/local.sh → estate/local.sh b/scripts/local.sh → estate/local.sh
diff --git a/estate/settings/__init__.py b/estate/settings/__init__.py
@@ -7,10 +7,10 @@
 from .sentry import * # NOQA
 from .estate import * # NOQA
 try:
-    from .local import * # NOQA
+    from .custom import * # NOQA
 except ImportError:
     pass
 try:
-    from .custom import * # NOQA
+    from .local import * # NOQA
 except ImportError:
     pass