Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#1 from gofed/ci-test
Browse files Browse the repository at this point in the history
CI
  • Loading branch information
openshift-merge-robot committed Apr 17, 2018
2 parents 66f647a + 701e519 commit e42e372
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
VERSION=`git describe --tags`
COMMIT=`git rev-parse HEAD`
BUILD=`date +%FT%T%z`
LDFLAG_LOCATION=github.com/kubernetes-incubator/descheduler/cmd/descheduler/app
REPO_ORG?=kubernetes-incubator
LDFLAG_LOCATION=github.com/${REPO_ORG}/descheduler/cmd/descheduler/app

LDFLAGS=-ldflags "-X ${LDFLAG_LOCATION}.version=${VERSION} -X ${LDFLAG_LOCATION}.buildDate=${BUILD} -X ${LDFLAG_LOCATION}.gitCommit=${COMMIT}"

Expand All @@ -30,7 +31,7 @@ IMAGE:=descheduler:$(VERSION)
all: build

build:
CGO_ENABLED=0 go build ${LDFLAGS} -o _output/bin/descheduler github.com/kubernetes-incubator/descheduler/cmd/descheduler
CGO_ENABLED=0 go build ${LDFLAGS} -o _output/bin/descheduler github.com/${REPO_ORG}/descheduler/cmd/descheduler

dev-image: build
docker build -f Dockerfile.dev -t $(IMAGE) .
Expand Down

0 comments on commit e42e372

Please sign in to comment.