github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 01:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

update build to run as current user

Browse Source 
pass user and group id in docker run command to run it as current user

Signed-off-by: Shovan Maity <shovan.cse91@gmail.com>
This commit is contained in:
Shovan Maity
2019-10-14 16:56:19 +05:30
parent 86d83c658d
commit 95b231727e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -153,6 +153,7 @@ $(SCOPE_UI_TOOLCHAIN_UPTODATE): client/yarn.lock $(SCOPE_UI_BUILD_UPTODATE)
-v $(shell pwd)/client:/home/weave/scope/client \
-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules \
-w /home/weave/scope/client \
-u $(shell id -u ${USER}):$(shell id -g ${USER}) \
$(SCOPE_UI_BUILD_IMAGE) yarn install; \
fi
touch $(SCOPE_UI_TOOLCHAIN_UPTODATE)
@@ -165,6 +166,7 @@ client/build/index.html: $(shell find client/app -type f) $(SCOPE_UI_TOOLCHAIN_U
-v $(shell pwd)/client:/home/weave/scope/client \
-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules \
-w /home/weave/scope/client \
-u $(shell id -u ${USER}):$(shell id -g ${USER}) \
$(SCOPE_UI_BUILD_IMAGE) yarn run build; \
fi
@@ -176,6 +178,7 @@ client/build-external/index.html: $(shell find client/app -type f) $(SCOPE_UI_TO
-v $(shell pwd)/client:/home/weave/scope/client \
-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules \
-w /home/weave/scope/client \
-u $(shell id -u ${USER}):$(shell id -g ${USER}) \
$(SCOPE_UI_BUILD_IMAGE) yarn run build-external; \
fi
@@ -185,6 +188,7 @@ client-test: $(shell find client/app/scripts -type f) $(SCOPE_UI_TOOLCHAIN_UPTOD
-v $(shell pwd)/client:/home/weave/scope/client \
-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules \
-w /home/weave/scope/client \
-u $(id -u ${USER}):$(id -g ${USER}) \
$(SCOPE_UI_BUILD_IMAGE) yarn test
client-lint: $(SCOPE_UI_TOOLCHAIN_UPTODATE)
@@ -193,6 +197,7 @@ client-lint: $(SCOPE_UI_TOOLCHAIN_UPTODATE)
-v $(shell pwd)/client:/home/weave/scope/client \
-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules \
-w /home/weave/scope/client \
-u $(shell id -u ${USER}):$(shell id -g ${USER}) \
$(SCOPE_UI_BUILD_IMAGE) yarn run lint
client-start: $(SCOPE_UI_TOOLCHAIN_UPTODATE)
@@ -202,6 +207,7 @@ client-start: $(SCOPE_UI_TOOLCHAIN_UPTODATE)
-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules \
-e WEBPACK_SERVER_HOST \
-w /home/weave/scope/client \
-u $(shell id -u ${USER}):$(shell id -g ${USER}) \
$(SCOPE_UI_BUILD_IMAGE) yarn start
client/bundle/weave-scope.tgz: $(shell find client/app -type f) $(SCOPE_UI_TOOLCHAIN_UPTODATE)
@@ -211,6 +217,7 @@ client/bundle/weave-scope.tgz: $(shell find client/app -type f) $(SCOPE_UI_TOOLC
-v $(shell pwd)/$(SCOPE_UI_TOOLCHAIN):/home/weave/scope/client/node_modules \
-v $(shell pwd)/tmp:/home/weave/tmp \
-w /home/weave/scope/client \
-u $(shell id -u ${USER}):$(shell id -g ${USER}) \
$(SCOPE_UI_BUILD_IMAGE) yarn run bundle
else