Skip to content

Commit 9c02541

Browse files
author
Joseph Atkins-Turkish
committed
Use absolute BASE_DIR and STATIC_ROOT, and uglify-js
1 parent a85a7df commit 9c02541

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ EXPOSE 8000
3838

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

4343
# Grab the toolchain
4444
RUN curl -o /tmp/arm-cs-tools.tar https://cloudpebble-vagrant.s3.amazonaws.com/arm-cs-tools-stripped.tar && \

cloudpebble/settings.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

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

11+
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
12+
1113
ADMINS = (
1214
('Administrator', '[email protected]'),
1315
)
@@ -90,7 +92,7 @@
9092
# Don't put anything in this directory yourself; store your static files
9193
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
9294
# Example: "/var/www/example.com/static/"
93-
STATIC_ROOT = 'staticfiles'
95+
STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
9496

9597
# URL prefix for static files.
9698
# Example: "http://example.com/static/", "http://static.example.com/"
@@ -353,7 +355,7 @@
353355
}
354356
},
355357
'loggers': {
356-
'django': {
358+
'*': {
357359
'handlers': ['console'],
358360
'level': 'DEBUG',
359361
'propagate': False

0 commit comments

Comments
 (0)