From fe774fc92b0a5abccb08e1e63c784965990885ef Mon Sep 17 00:00:00 2001 From: Kyle Rockman Date: Fri, 15 Sep 2017 13:37:30 -0500 Subject: [PATCH] fix local development when using it downstream --- docker-compose.yml | 3 +-- {scripts => estate}/local.sh | 0 estate/settings/__init__.py | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) rename {scripts => estate}/local.sh (100%) diff --git a/docker-compose.yml b/docker-compose.yml index a3349a8..1d0fd0f 100644 --- 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 b/estate/local.sh similarity index 100% rename from scripts/local.sh rename to estate/local.sh diff --git a/estate/settings/__init__.py b/estate/settings/__init__.py index ba73cae..4b1e941 100644 --- 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