Explorar o código

Support `make clean install` usage

James Allen %!s(int64=9) %!d(string=hai) anos
pai
achega
bb74f8318a
Modificáronse 1 ficheiros con 4 adicións e 3 borrados
  1. 4 3
      services/web/Makefile

+ 4 - 3
services/web/Makefile

@@ -18,7 +18,7 @@ add_dev: docker-shared.yml
 install: docker-shared.yml
 install: docker-shared.yml
 	$(NPM) install
 	$(NPM) install
 
 
-clean: docker-shared.yml
+clean:
 	rm -f app.js
 	rm -f app.js
 	rm -rf app/js
 	rm -rf app/js
 	rm -rf test/unit/js
 	rm -rf test/unit/js
@@ -32,8 +32,9 @@ clean: docker-shared.yml
 	done
 	done
 	# Deletes node_modules volume
 	# Deletes node_modules volume
 	docker-compose down --volumes
 	docker-compose down --volumes
-	# Delete after docker-compose command
-	rm -f docker-shared.yml
+	# Regenerate docker-shared.yml - not stictly a 'clean',
+	# but lets `make clean install` work nicely
+	bin/generate_volumes_file
 
 
 # Need regenerating if you change the web modules you have installed
 # Need regenerating if you change the web modules you have installed
 docker-shared.yml:
 docker-shared.yml: