File tree Expand file tree Collapse file tree 2 files changed +11
-6
lines changed Expand file tree Collapse file tree 2 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -9,6 +9,8 @@ include includes.mk versioning.mk
9
9
# the filepath to this repository, relative to $GOPATH/src
10
10
REPO_PATH = github.com/deis/registry
11
11
12
+ SHELL_SCRIPTS = $(wildcard _scripts/* .sh contrib/ci/* .sh)
13
+
12
14
# The following variables describe the containerized development environment
13
15
# and other build options
14
16
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.20.0
@@ -43,10 +45,13 @@ build-binary:
43
45
$(call check-static-binary,$(BINDIR ) /${SHORT_NAME})
44
46
${DEV_ENV_CMD} upx -9 --brute $(BINDIR ) /${SHORT_NAME}
45
47
46
- test : check-docker
48
+ test : check-docker test-style
47
49
contrib/ci/test.sh ${IMAGE}
48
50
51
+ test-style :
52
+ ${DEV_ENV_CMD} shellcheck $(SHELL_SCRIPTS )
53
+
49
54
deploy : check-kubectl docker-build docker-push
50
55
kubectl --namespace=deis patch deployment deis-$(SHORT_NAME ) --type=' json' -p=' [{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}]'
51
56
52
- .PHONY : all build build-binary docker-build test deploy
57
+ .PHONY : all build build-binary docker-build test test-style deploy
Original file line number Diff line number Diff line change 2
2
3
3
set -eoxf pipefail
4
4
5
- JOB=$( docker run -d $1 )
5
+ JOB=$( docker run -d " $1 " )
6
6
# let the registry run for a few seconds
7
7
sleep 5
8
8
# check that the registry is still up
9
- docker logs $ JOB
10
- docker ps -q --no-trunc=true | grep $ JOB
11
- docker rm -f $ JOB
9
+ docker logs " ${ JOB} "
10
+ docker ps -q --no-trunc=true | grep " ${ JOB} "
11
+ docker rm -f " ${ JOB} "
You can’t perform that action at this time.
0 commit comments