mirror of
https://github.com/outbackdingo/matchbox.git
synced 2026-01-27 18:19:36 +00:00
Merge pull request #29 from philips/allow-building-on-osx
build: don't force GOOS=linux
This commit is contained in:
@@ -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
2
build
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user