From 2e16c5e21d9580aed9242c1b8b480b1181201160 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Tue, 2 Jun 2015 11:24:02 +0000 Subject: [PATCH] Add client-sync target for doing client dev with the container and use shorter version string when building for source. --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c2245b2e3..5cc2e7c25 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all deps static clean +.PHONY: all deps static clean client-lint client-sync # If you can use Docker without being root, you can `make SUDO= ` SUDO=sudo @@ -11,7 +11,7 @@ SCOPE_IMAGE=$(DOCKERHUB_USER)/scope SCOPE_EXPORT=scope.tar SCOPE_UI_BUILD_EXPORT=scope_ui_build.tar SCOPE_UI_BUILD_IMAGE=$(DOCKERHUB_USER)/scope-ui-build -SCOPE_VERSION=$(shell git rev-parse HEAD) +SCOPE_VERSION=$(shell git rev-parse --short HEAD) all: $(SCOPE_EXPORT) @@ -56,6 +56,11 @@ client-lint: -v $(shell pwd)/client/test:/home/weave/test \ $(SCOPE_UI_BUILD_IMAGE) npm run lint +client-sync: + docker run -ti --net=host -v $(shell pwd)/client/app:/home/weave/app \ + -v $(shell pwd)/client/build:/home/weave/build \ + $(SCOPE_UI_BUILD_IMAGE) gulp sync + $(SCOPE_UI_BUILD_EXPORT): client/Dockerfile client/gulpfile.js client/package.json docker build -t $(SCOPE_UI_BUILD_IMAGE) client docker save $(SCOPE_UI_BUILD_IMAGE):latest > $@