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

only add Docker -it flags if TTY

Browse Source
This commit is contained in:
Henning Jacobs
2017-04-24 15:03:14 +02:00
parent b1150b797f
commit cf1a4dbb70
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@@ -5,7 +5,8 @@ VERSION ?= $(shell git describe --tags --always --dirty)
TAG ?= $(VERSION)
GITHEAD = $(shell git rev-parse --short HEAD)
GITURL = $(shell git config --get remote.origin.url)
GITSTATU = $(shell git status --porcelain || echo "no changes")
GITSTATUS = $(shell git status --porcelain || echo "no changes")
TTYFLAGS = $(shell test -t 0 && echo "-it")
default: docker
@@ -16,8 +17,8 @@ test:
tox
appjs:
docker run -it -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:7.4-alpine npm install
docker run -it -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:7.4-alpine npm run build
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:7.4-alpine npm install
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:7.4-alpine npm run build
docker: appjs scm-source.json
docker build --build-arg "VERSION=$(VERSION)" -t "$(IMAGE):$(TAG)" .
@@ -27,8 +28,8 @@ push: docker
docker push "$(IMAGE):$(TAG)"
mock:
docker run -it -p 8080:8080 "$(IMAGE):$(TAG)" --mock
docker run $(TTYFLAGS) -p 8080:8080 "$(IMAGE):$(TAG)" --mock
scm-source.json: .git
@echo '{"url": "$(GITURL)", "revision": "$(GITHEAD)", "author": "$(USER)", "status": "$(GITSTATUS)"}' > scm-source.json
@echo '{"url": "git:$(GITURL)", "revision": "$(GITHEAD)", "author": "$(USER)", "status": "$(GITSTATUS)"}' > scm-source.json