Skip to content

Commit 9bde136

Browse files
committed
Merge pull request #4057 from mboersma/silence-static-checks
fix(Makefiles): silence static binary check
2 parents eae5d67 + 5f238dd commit 9bde136

6 files changed

Lines changed: 8 additions & 6 deletions

File tree

builder/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ BINARY_DEST_DIR := rootfs/usr/bin
1616
build: check-docker
1717
for i in $(BINARIES); do \
1818
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' -o $(BINARY_DEST_DIR)/$$i src/$$i.go || exit 1; \
19-
$(call check-static-binary,$(BINARY_DEST_DIR)/$$i) \
19+
done
20+
@for i in $(BINARIES); do \
21+
$(call check-static-binary,$(BINARY_DEST_DIR)/$$i); \
2022
done
2123
docker build -t $(IMAGE) rootfs
2224

cache/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ BINARY_DEST_DIR = image/bin
1313

1414
build: check-docker
1515
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' -o $(BINARY_DEST_DIR)/boot main.go || exit 1
16-
$(call check-static-binary,$(BINARY_DEST_DIR)/boot)
16+
@$(call check-static-binary,$(BINARY_DEST_DIR)/boot)
1717
docker build -t $(IMAGE) image
1818

1919
clean: check-docker check-registry

logger/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ BINARY_DEST_DIR = image/bin
1515

1616
build: check-docker
1717
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' -o $(BINARY_DEST_DIR)/logger github.com/deis/deis/logger || exit 1
18-
$(call check-static-binary,$(BINARY_DEST_DIR)/logger)
18+
@$(call check-static-binary,$(BINARY_DEST_DIR)/logger)
1919
docker build -t $(IMAGE) image
2020

2121
clean: check-docker check-registry

logspout/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ DEV_DOCKER_IMAGE := $(REGISTRY)$(RELEASE_IMAGE)
1414

1515
build: check-docker
1616
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' -o image/logspout
17-
$(call check-static-binary,image/logspout)
17+
@$(call check-static-binary,image/logspout)
1818
docker build -t $(RELEASE_IMAGE) image
1919

2020
clean:

publisher/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ BINARY_DEST_DIR = image/bin
1515

1616
build: check-docker
1717
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' -o $(BINARY_DEST_DIR)/publisher github.com/deis/deis/publisher || exit 1
18-
$(call check-static-binary,$(BINARY_DEST_DIR)/publisher)
18+
@$(call check-static-binary,$(BINARY_DEST_DIR)/publisher)
1919
docker build -t $(RELEASE_IMAGE) image
2020

2121
clean: check-docker check-registry

router/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ build: check-docker
1818
docker build -t $(BUILD_IMAGE) .
1919
docker cp `docker run -d $(BUILD_IMAGE) /bin/bash`:/nginx.tgz image/
2020
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix -v -ldflags '-s' -o $(BINARY_DEST_DIR)/boot boot.go || exit 1
21-
$(call check-static-binary,image/bin/boot)
21+
@$(call check-static-binary,image/bin/boot)
2222
docker build -t $(IMAGE) image
2323
rm image/nginx.tgz
2424
rm image/bin/boot

0 commit comments

Comments
 (0)