mirror of
https://github.com/fspc/workstand.git
synced 2026-09-16 16:41:38 -04:00
Refactor webpack into its own docker service.
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
import sys
|
||||
from .base import *
|
||||
|
||||
|
||||
@@ -14,11 +15,14 @@ DATABASES = {
|
||||
'ENGINE': 'django.db.backends.postgresql',
|
||||
'NAME': 'postgres',
|
||||
'USER': 'postgres',
|
||||
'HOST': 'db',
|
||||
'HOST': 'workstand_db_1',
|
||||
'PORT': '5432',
|
||||
}
|
||||
}
|
||||
|
||||
if 'test' in sys.argv or 'test_coverage' in sys.argv: #Covers regular testing and django-coverage
|
||||
DATABASES['default']['ENGINE'] = 'django.db.backends.sqlite3'
|
||||
|
||||
LOGGING = {
|
||||
'version': 1,
|
||||
'disable_existing_loggers': False,
|
||||
@@ -45,9 +49,11 @@ LOGGING = {
|
||||
},
|
||||
}
|
||||
|
||||
INSTALLED_APPS += [
|
||||
'debug_toolbar'
|
||||
]
|
||||
# INSTALLED_APPS += [
|
||||
# 'debug_toolbar'
|
||||
# ]
|
||||
|
||||
# MIDDLEWARE_CLASSES += ['debug_toolbar.middleware.DebugToolbarMiddleware']
|
||||
|
||||
# Don't worry about IP addresses, just show the toolbar.
|
||||
DEBUG_TOOLBAR_CONFIG = {
|
||||
|
||||
@@ -7,13 +7,13 @@ var config = require('./webpack.base.config.js')
|
||||
|
||||
// Use webpack dev server
|
||||
config.entry = [
|
||||
'webpack-dev-server/client?http://localhost:3000',
|
||||
'webpack-dev-server/client?http://webpack.docker:3000',
|
||||
'webpack/hot/only-dev-server',
|
||||
'./assets/js/index'
|
||||
]
|
||||
|
||||
// override django's STATIC_URL for webpack bundles
|
||||
config.output.publicPath = 'http://localhost:3000/assets/bundles/'
|
||||
config.output.publicPath = 'http://webpack.docker:3000/assets/bundles/'
|
||||
|
||||
// Add HotModuleReplacementPlugin and BundleTracker plugins
|
||||
config.plugins = config.plugins.concat([
|
||||
|
||||
Reference in New Issue
Block a user