Skip to content

Commit

Permalink
Makefile: fix cni-plugins to build on OSX
Browse files Browse the repository at this point in the history
The wc command prefixes spaces to the output, which
corrupts the GIT_PORCELAIN variable, thus failing
the build. This change removes spaces from the output.
  • Loading branch information
aaithal committed Sep 27, 2017
1 parent d09c3a2 commit 9598854
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ cni-plugins: get-cni-sources
mkdir -p out/cni-plugins
docker run --rm --net=none \
-e GIT_SHORT_HASH=$(shell cd $(ECS_CNI_REPOSITORY_SRC_DIR) && git rev-parse --short HEAD) \
-e GIT_PORCELAIN=$(shell cd $(ECS_CNI_REPOSITORY_SRC_DIR) && git status --porcelain 2> /dev/null | wc -l) \
-e GIT_PORCELAIN=$(shell cd $(ECS_CNI_REPOSITORY_SRC_DIR) && git status --porcelain 2> /dev/null | wc -l | sed 's/^ *//') \
-v "$(PWD)/out/cni-plugins:/go/src/github.com/aws/amazon-ecs-cni-plugins/bin/plugins" \
-v "$(ECS_CNI_REPOSITORY_SRC_DIR):/go/src/github.com/aws/amazon-ecs-cni-plugins" \
"amazon/amazon-ecs-build-cniplugins:make"
Expand Down

0 comments on commit 9598854

Please sign in to comment.