Skip to content
Permalink
Browse files

Makefile: place built binaries in the root of the project

We do have some internal processes that are currently using the original
paths, so reverting changes regarding build location.
  • Loading branch information...
isutton authored and parhamdoustdar committed Dec 14, 2018
1 parent 41b2720 commit 674694b466d8e28995fbcb479fa298f4b527e642
Showing with 9 additions and 6 deletions.
  1. +5 −2 .gitignore
  2. +1 −1 Dockerfile.shipper
  3. +1 −1 Dockerfile.shipper-state-metrics
  4. +2 −2 Makefile
@@ -1,7 +1,10 @@
.testCoverage.txt
e2e.test
.vscode/
pkg/chart/testdata/chartmuseum
pkg/chart/testdata/index.yaml
docs/generated
build/

# Binaries generated when building Shipper
./shipper
./shipper-state-metrics
./e2e.test
@@ -1,5 +1,5 @@
FROM alpine:3.8
LABEL authors="Parham Doustdar <parham.doustdar@booking.com>, Alexey Surikov <alexey.surikov@booking.com>, Igor Sutton <igor.sutton@booking.com>, Ben Tyler <benjamin.tyler@booking.com>"
RUN apk add ca-certificates
ADD build/shipper /bin/shipper
ADD shipper /bin/shipper
ENTRYPOINT ["shipper", "-disable", "clustersecret", "-v", "4", "-logtostderr"]
@@ -1,5 +1,5 @@
FROM alpine:3.8
LABEL authors="Parham Doustdar <parham.doustdar@booking.com>, Alexey Surikov <alexey.surikov@booking.com>, Igor Sutton <igor.sutton@booking.com>, Ben Tyler <benjamin.tyler@booking.com>"
RUN apk add ca-certificates
ADD build/shipper-state-metrics /bin/shipper-state-metrics
ADD shipper-state-metrics /bin/shipper-state-metrics
ENTRYPOINT ["shipper-state-metrics", "-v", "2"]
@@ -4,12 +4,12 @@ KUBECTL = kubectl -n $(SHIPPER_NAMESPACE)
.PHONY: shipper

shipper:
GOARCH=amd64 CGO_ENABLED=0 GOOS=linux go build -o build/shipper ./cmd/shipper/*.go
GOARCH=amd64 CGO_ENABLED=0 GOOS=linux go build -o shipper ./cmd/shipper/*.go
docker build -f Dockerfile.shipper -t localhost:32000/shipper:latest --build-arg HTTP_PROXY=$(HTTP_PROXY) --build-arg HTTPS_PROXY=$(HTTPS_PROXY) .
docker push localhost:32000/shipper:latest

shipper-state-metrics:
GOARCH=amd64 CGO_ENABLED=0 GOOS=linux go build -o build/shipper-state-metrics ./cmd/shipper-state-metrics/*.go
GOARCH=amd64 CGO_ENABLED=0 GOOS=linux go build -o shipper-state-metrics ./cmd/shipper-state-metrics/*.go
docker build -f Dockerfile.shipper-state-metrics -t localhost:32000/shipper-state-metrics:latest --build-arg HTTP_PROXY=$(HTTP_PROXY) --build-arg HTTPS_PROXY=$(HTTPS_PROXY) .
docker push localhost:32000/shipper-state-metrics:latest

0 comments on commit 674694b

Please sign in to comment.
You can’t perform that action at this time.