From bbdec3fb623dcd584b470c268af86c3747803d7a Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon.philips@coreos.com>
Date: Sat, 16 Jan 2016 14:29:25 -0800
Subject: [PATCH] build: don't force GOOS=linux

There is no reason to force this. Instead have the docker-build command
do it before it is built.

Also, use the actual package name: bootcfg. It confused me that bootcfg
was called server.
---
 Dockerfile   | 4 ++--
 build        | 2 +-
 docker-build | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ac8f51d9..3d91f9ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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"]
diff --git a/build b/build
index 46d478f8..15564240 100755
--- a/build
+++ b/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
diff --git a/docker-build b/docker-build
index 402f0ada..338cb412 100755
--- a/docker-build
+++ b/docker-build
@@ -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
\ No newline at end of file
+docker tag -f $REPO:$GIT_SHA $REPO:latest