Merge pull request #29 from philips/allow-building-on-osx

build: don't force GOOS=linux
This commit is contained in:
Dalton Hubble
2016-01-19 01:14:29 -08:00
3 changed files with 5 additions and 4 deletions

View File

@@ -1,5 +1,5 @@
FROM alpine:latest
MAINTAINER Dalton Hubble <dalton.hubble@coreos.com>
COPY bin/server /server
COPY bin/bootcfg /bootcfg
EXPOSE 8080
ENTRYPOINT ["./server"]
ENTRYPOINT ["./bootcfg"]

2
build
View File

@@ -9,4 +9,4 @@ mkdir -p $GOPATH/src/github.com/coreos
[ -d $GOPATH/src/github.com/coreos/coreos-baremetal ] || ln -s ${PWD} $GOPATH/src/github.com/coreos/coreos-baremetal
LD_FLAGS="-w -X main.version=$(./git-version)"
CGO_ENABLED=0 GOOS=linux go build -o bin/server -ldflags "$LD_FLAGS" -a -tags netgo github.com/coreos/coreos-baremetal/cmd/bootcfg
CGO_ENABLED=0 go build -o bin/bootcfg -ldflags "$LD_FLAGS" -a -tags netgo github.com/coreos/coreos-baremetal/cmd/bootcfg

View File

@@ -3,5 +3,6 @@
REPO=coreos/bootcfg
GIT_SHA=$(./git-version)
GOOS=linux ./build
docker build -q --rm=true -t $REPO:$GIT_SHA .
docker tag -f $REPO:$GIT_SHA $REPO:latest
docker tag -f $REPO:$GIT_SHA $REPO:latest