Skip to content

Commit

Permalink
Use absolute BASE_DIR and STATIC_ROOT, and uglify-js
Browse files Browse the repository at this point in the history
  • Loading branch information
Joseph Atkins-Turkish committed Feb 5, 2016
1 parent a85a7df commit 9c02541
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ EXPOSE 8000

# CloudPebble stuff
RUN npm install -g bower && echo '{"allow_root": true}' > ~/.bowerrc
RUN npm install -g uglifyjs clean-css
RUN npm install -g uglify-js clean-css

# Grab the toolchain
RUN curl -o /tmp/arm-cs-tools.tar https://cloudpebble-vagrant.s3.amazonaws.com/arm-cs-tools-stripped.tar && \
Expand Down
6 changes: 4 additions & 2 deletions cloudpebble/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

DEBUG = _environ.get('DEBUG', '') != ''

BASE_DIR = os.path.dirname(os.path.dirname(__file__))

ADMINS = (
('Administrator', '[email protected]'),
)
Expand Down Expand Up @@ -90,7 +92,7 @@
# Don't put anything in this directory yourself; store your static files
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/var/www/example.com/static/"
STATIC_ROOT = 'staticfiles'
STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')

# URL prefix for static files.
# Example: "http://example.com/static/", "http://static.example.com/"
Expand Down Expand Up @@ -353,7 +355,7 @@
}
},
'loggers': {
'django': {
'*': {
'handlers': ['console'],
'level': 'DEBUG',
'propagate': False
Expand Down

0 comments on commit 9c02541

Please sign in to comment.