Merge pull request #455 from shipyard/swarm-v3

v3

.gitignore

@@ -3,3 +3,4 @@
 cli/cli
 controller/controller
 Godeps/_workspace
+bower_components

Dockerfile.build

@@ -1,15 +1,15 @@
-FROM golang:1.3-cross
+FROM golang:1.5
 
 RUN curl -sL https://deb.nodesource.com/setup | bash -
 RUN apt-get update && apt-get install -y nodejs
 RUN npm install -g bower
 RUN go get github.com/tools/godep
 
-ADD . /go/src/github.com/shipyard/shipyard
-
-ADD https://get.docker.com/builds/Linux/x86_64/docker-1.5.0 /usr/local/bin/docker
+ADD https://get.docker.com/builds/Linux/x86_64/docker-1.7.0 /usr/local/bin/docker
 RUN chmod +x /usr/local/bin/docker
 ENV TAG latest
+ENV PATH $PATH:/go/bin:/usr/local/go/bin
 
-WORKDIR /go/src/github.com/shipyard/shipyard
+COPY . /go/src/github.com/shipyard/shipyard
 
+WORKDIR /go/src/github.com/shipyard/shipyard

Makefile

@@ -0,0 +1,33 @@
+CGO_ENABLED=0
+GOOS=linux
+GOARCH=amd64
+TAG=${TAG:-latest}
+COMMIT=`git rev-parse --short HEAD`
+
+all: build media
+
+clean:
+	@rm -rf controller/controller
+
+build:
+	@cd controller && godep go build -a -tags "netgo static_build" -installsuffix netgo -ldflags "-w -X github.com/shipyard/shipyard/version.GitCommit=$(COMMIT)" .
+
+remote-build:
+	@docker build -t shipyard-build -f Dockerfile.build .
+	@rm -f ./controller/controller
+	@cd controller && docker run --rm -w /go/src/github.com/shipyard/shipyard --entrypoint /bin/bash shipyard-build -c "make build 1>&2 && cd controller && tar -czf - controller" | tar zxf -
+
+media:
+	@cd controller/static && bower -s install --allow-root -p | xargs echo > /dev/null
+
+image: media build
+	@echo Building Shipyard image $(TAG)
+	@cd controller && docker build -t shipyard/shipyard:$(TAG) .
+
+release: build image
+	@docker push shipyard/shipyard:$(TAG)
+
+test: clean 
+	@godep go test -v ./...
+
+.PHONY: all build clean media image test release