lnmch/kops-arm64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update dependencies (#185)

Browse Source 
* update dependencies

* fix Travis build (NPM cache path)
This commit is contained in:
Henning Jacobs
2018-12-11 19:37:06 +01:00
committed by GitHub
parent 384ea8f06d
commit e4d925e101
9 changed files with 2364 additions and 2209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@@ -3,9 +3,6 @@
IMAGE ?= hjacobs/kube-ops-view
VERSION ?= $(shell git describe --tags --always --dirty)
TAG ?= $(VERSION)
GITHEAD = $(shell git rev-parse HEAD)
GITURL = $(shell git config --get remote.origin.url)
GITSTATUS = $(shell git status --porcelain || echo "no changes")
TTYFLAGS = $(shell test -t 0 && echo "-it")
default: docker
@@ -14,13 +11,15 @@ clean:
rm -fr kube_ops_view/static/build
test:
tox
pipenv run flake8
pipenv run coverage run --source=kube_ops_view -m py.test
pipenv run coverage report
appjs:
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:9.11-alpine npm install
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:9.11-alpine npm run build
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app -e NPM_CONFIG_CACHE=/tmp node:11.4-alpine npm install
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app -e NPM_CONFIG_CACHE=/tmp node:11.4-alpine npm run build
docker: appjs scm-source.json
docker: appjs
docker build --build-arg "VERSION=$(VERSION)" -t "$(IMAGE):$(TAG)" .
@echo 'Docker image $(IMAGE):$(TAG) can now be used.'
@@ -29,7 +28,3 @@ push: docker
mock:
docker run $(TTYFLAGS) -p 8080:8080 "$(IMAGE):$(TAG)" --mock
scm-source.json: .git
@echo '{"url": "git:$(GITURL)", "revision": "$(GITHEAD)", "author": "$(USER)", "status": "$(GITSTATUS)"}' > scm-source.json