Merge pull request #7 from cpennington/static-assets-in-devstack

Static assets in devstack

Makefile

@@ -5,28 +5,36 @@
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  help                       display this help message"
 	@echo "  clean                      delete generated byte code and coverage reports"
 	@echo "  compile_translations       compile translation files, outputting .po files for each supported language"
 	@echo "  dummy_translations         generate dummy translation (.po) files"
 	@echo "  extract_translations       extract strings to be translated, outputting .mo files"
 	@echo "  fake_translations          generate and compile dummy translation files"
-	@echo "  help                       display this help message"
 	@echo "  html_coverage              generate and view HTML coverage report"
 	@echo "  migrate                    apply database migrations"
 	@echo "  pull_translations          pull translations from Transifex"
 	@echo "  push_translations          push source translation files (.po) from Transifex"
 	@echo "  quality                    run PEP8 and Pylint"
-	@echo "  requirements               install requirements for local development"
+	@echo "  requirements               install requirements for production"
+	@echo "  local-requirements         install requirements for local development"
 	@echo "  test                       run tests and generate coverage report"
 	@echo "  validate                   run tests and quality checks"
+	@echo "  static                     gather all static assets for production"
+	@echo "  clean_static               remove all generated static files"
 	@echo "  start-devstack             run a local development copy of the server"
 	@echo "  open-devstack              open a shell on the server started by start-devstack"
 	@echo ""
 
-clean:
+static:
+	python manage.py collectstatic --noinput
+
+clean_static:
+	rm -rf assets/ course_discovery/static/build
+
+clean: clean_static
 	find . -name '*.pyc' -delete
 	coverage erase
-	rm -rf assets
 
 local-requirements:
 	pip install -qr requirements/local.txt --exists-action w
@@ -45,7 +53,7 @@ quality:
 validate: test quality
 
 migrate:
-	python manage.py migrate
+	python manage.py migrate --noinput
 
 html_coverage:
 	coverage html && open htmlcov/index.html

course_discovery/settings/devstack.py

+from course_discovery.settings.production import *
+
+DEBUG = True
+
+del LOGGING['handlers']['local']
+
+# TOOLBAR CONFIGURATION
+# See: http://django-debug-toolbar.readthedocs.org/en/latest/installation.html
+if os.environ.get('ENABLE_DJANGO_TOOLBAR', False):
+    INSTALLED_APPS += (
+        'debug_toolbar',
+    )
+
+    MIDDLEWARE_CLASSES += (
+        'debug_toolbar.middleware.DebugToolbarMiddleware',
+    )
+
+    DEBUG_TOOLBAR_PATCH_SETTINGS = False
+
+INTERNAL_IPS = ('127.0.0.1',)
+# END TOOLBAR CONFIGURATION

docker-compose.yml

@@ -32,4 +32,6 @@ course-discovery:
     - .:/edx/app/course_discovery/course_discovery
   command: /edx/app/course_discovery/devstack.sh start
   ports:
-    - "18381:18381"
+    - "18381:18381"
\ No newline at end of file
+    - "8381:8381"
+    - "48381:48381"
\ No newline at end of file