File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11SHELL = /bin/bash
2+ include includes.mk
23
34DOCKER_HOST = $(shell echo $$DOCKER_HOST)
45BUILD_TAG ?= git-$(shell git rev-parse --short HEAD)
56SHORT_NAME ?= nsq
67DEIS_REGISTRY ?= ${DEV_REGISTRY}
78IMAGE_PREFIX ?= deis
89
10+ TEST_ENV_PREFIX := docker run --rm -v ${CURDIR}:/bash -w /bash quay.io/deis/shell-dev
11+ SHELL_SCRIPTS = $(wildcard rootfs/opt/nsq/bin/* )
12+
913include versioning.mk
1014
1115build : docker-build
@@ -21,6 +25,11 @@ docker-build:
2125clean : check-docker
2226 docker rmi $(IMAGE )
2327
28+ test : test-style
29+
30+ test-style : check-docker
31+ ${TEST_ENV_PREFIX} shellcheck $(SHELL_SCRIPTS )
32+
2433update-manifests :
2534 sed ' s#\(image:\) .*#\1 $(IMAGE)#' manifests/deis-nsqd-rc.yaml > manifests/deis-nsqd-rc.tmp.yaml
2635
@@ -35,3 +44,6 @@ kube-delete:
3544kube-update : update-manifests
3645 kubectl delete -f manifests/deis-nsqd-rc.tmp.yaml
3746 kubectl create -f manifests/deis-nsqd-rc.tmp.yaml
47+
48+ .PHONY : build push install uninstall upgrade docker-build clean test test-style \
49+ update-manifests kube-install kube-delete kube-update
Original file line number Diff line number Diff line change 1+ SHELL := /bin/bash
2+
3+ check-docker :
4+ @if [ -z $$ (which docker) ]; then \
5+ echo " Missing \` docker\` client which is required for development" ; \
6+ exit 2; \
7+ fi
8+
9+ check-kubectl :
10+ @if [ -z $$ (which kubectl) ]; then \
11+ echo " Missing \` kubectl\` client which is required for development" ; \
12+ exit 2; \
13+ fi
Original file line number Diff line number Diff line change @@ -3,4 +3,4 @@ set -eo pipefail
33
44export MAX_READY_COUNT=${MAX_READY_COUNT:- 10000}
55export DATA_PATH=${DATA_PATH:-/ opt/ nsq/ data}
6- exec nsqd -max-rdy-count ${MAX_READY_COUNT} --data-path ${DATA_PATH}
6+ exec nsqd -max-rdy-count " ${MAX_READY_COUNT} " --data-path " ${DATA_PATH} "
You can’t perform that action at this time.
0 commit comments