diff --git a/bb_public/static/css/django-pwa-app.css b/bb_public/static/css/pwa.css similarity index 100% rename from bb_public/static/css/django-pwa-app.css rename to bb_public/static/css/pwa.css diff --git a/bb_public/static/pwa/serviceworker.js b/bb_public/static/pwa/serviceworker.js index 331789a..093c90d 100644 --- a/bb_public/static/pwa/serviceworker.js +++ b/bb_public/static/pwa/serviceworker.js @@ -4,7 +4,7 @@ var staticCacheName = "django-pwa-v" + new Date().getTime(); var filesToCache = [ '/offline/', '/static/brickbox_icon/favicon-32x32.png', - '/static/css/django-pwa-app.css', + '/static/css/pwa.css', // '/static/images/icons/icon-72x72.png', // '/static/images/icons/icon-96x96.png', // '/static/images/icons/icon-128x128.png', diff --git a/puller/scripts/continuous_deployment.sh b/puller/scripts/continuous_deployment.sh index 7d6762a..37b496b 100755 --- a/puller/scripts/continuous_deployment.sh +++ b/puller/scripts/continuous_deployment.sh @@ -1,3 +1,6 @@ #!/bin/bash +# Pulls the latest code from GitHub, performs the required steps then deploys. + git pull +python3 /opt/brickbox/manage.py collectstatic --noinput diff --git a/puller/views.py b/puller/views.py index e3b9188..323aa46 100644 --- a/puller/views.py +++ b/puller/views.py @@ -1,4 +1,4 @@ -# ''' CI/CD Functions ''' +''' CI/CD Functions ''' import subprocess