Merge pull request #29 from nottrobin/clean-cache-django-fixes

Only clear pip cache in django scripts

.gitignore

@@ -1 +1,2 @@
 node_modules/
+package-lock.json

generators/run/templates/gitignore

@@ -25,6 +25,7 @@ pids
 
 # [deps] Local dependencies
 .bundle/
+.package-lock.json  # Normally lockfiles would be committed, but we use yarn instead of NPM for locking dependencies
 node_modules/
 bower_components/
 vendor/

generators/run/templates/run

@@ -341,11 +341,13 @@ case $run_command in
         if [ -n "${containers_using_volume}" ]; then docker rm --force ${containers_using_volume}; fi
         docker volume rm --force ${yarn_cache_volume}
 
-        # Clean node cache volume
+        <% if (django) { %>
+        # Clean pip cache volume
         echo "Removing cache volume ${pip_cache_volume}"
         containers_using_volume=$(docker ps --quiet --all --filter "volume=${pip_cache_volume}")
         if [ -n "${containers_using_volume}" ]; then docker rm --force ${containers_using_volume}; fi
-        <% if (django) { %> docker volume rm --force ${pip_cache_volume} <% } %>
+        docker volume rm --force ${pip_cache_volume}
+        <% } %>
     ;;
 <% if (django) { %>    "django")
         expose_port=""

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-canonical-webteam",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Generators for creating and maintaining Canonical webteam projects",
   "homepage": "https://design.canonical.com/team",
   "author": {