public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

clean up makefile

This commit is contained in:
Priya Wadhwa 2018-04-27 14:58:25 -07:00
parent 3705de2298
commit b9435943ec
No known key found for this signature in database
GPG Key ID: 0D0DAFD8F7AA73AE
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -34,13 +34,11 @@ GO_LDFLAGS += -X $(VERSION_PACKAGE).version=$(VERSION)
GO_LDFLAGS += -w -s # Drop debugging symbols. GO_LDFLAGS += -w -s # Drop debugging symbols.
GO_LDFLAGS += ' GO_LDFLAGS += '
GO_BUILD_TAGS := "containers_image_ostree_stub containers_image_openpgp exclude_graphdriver_devicemapper exclude_graphdriver_btrfs exclude_graphdriver_overlay"
EXECUTOR_PACKAGE = $(REPOPATH)/cmd/executor EXECUTOR_PACKAGE = $(REPOPATH)/cmd/executor
KANIKO_PROJECT = $(REPOPATH)/kaniko KANIKO_PROJECT = $(REPOPATH)/kaniko
out/executor: $(GO_FILES) out/executor: $(GO_FILES)
GOARCH=$(GOARCH) GOOS=linux CGO_ENABLED=0 go build -ldflags $(GO_LDFLAGS) -tags $(GO_BUILD_TAGS) -o $@ $(EXECUTOR_PACKAGE) GOARCH=$(GOARCH) GOOS=linux CGO_ENABLED=0 go build -ldflags $(GO_LDFLAGS) -o $@ $(EXECUTOR_PACKAGE)
.PHONY: test .PHONY: test
test: out/executor test: out/executor
@ -51,5 +49,5 @@ integration-test:
@ ./integration-test.sh @ ./integration-test.sh
.PHONY: images .PHONY: images
images: out/executor images:
docker build -t $(REGISTRY)/executor:latest -f deploy/Dockerfile . docker build -t $(REGISTRY)/executor:latest -f deploy/Dockerfile .

5
deploy/Dockerfile
View File

@ -14,11 +14,10 @@
# Builds the static Go image to execute in a Kubernetes job # Builds the static Go image to execute in a Kubernetes job
FROM golang FROM golang:1.10
WORKDIR /go/src/github.com/GoogleContainerTools/kaniko WORKDIR /go/src/github.com/GoogleContainerTools/kaniko
RUN apt-get update && apt-get install -y make
COPY . . COPY . .
RUN make -B RUN make
FROM scratch FROM scratch
COPY --from=0 /go/src/github.com/GoogleContainerTools/kaniko/out/executor /kaniko/executor COPY --from=0 /go/src/github.com/GoogleContainerTools/kaniko/out/executor /kaniko/executor

2
test.sh
View File

@ -21,7 +21,7 @@ GREEN='\033[0;32m'
RESET='\033[0m' RESET='\033[0m'
echo "Running go tests..." echo "Running go tests..."
go test -cover -v -tags "containers_image_ostree_stub containers_image_openpgp exclude_graphdriver_devicemapper exclude_graphdriver_btrfs" -timeout 60s `go list ./... | grep -v vendor` | sed ''/PASS/s//$(printf "${GREEN}PASS${RESET}")/'' | sed ''/FAIL/s//$(printf "${RED}FAIL${RESET}")/'' go test -cover -v -timeout 60s `go list ./... | grep -v vendor` | sed ''/PASS/s//$(printf "${GREEN}PASS${RESET}")/'' | sed ''/FAIL/s//$(printf "${RED}FAIL${RESET}")/''
GO_TEST_EXIT_CODE=${PIPESTATUS[0]} GO_TEST_EXIT_CODE=${PIPESTATUS[0]}
if [[ $GO_TEST_EXIT_CODE -ne 0 ]]; then if [[ $GO_TEST_EXIT_CODE -ne 0 ]]; then
exit $GO_TEST_EXIT_CODE exit $GO_TEST_EXIT_CODE