ref(swarm): build deis/swarm image like other components

Author: mboersma

.gitignore

@@ -31,7 +31,7 @@ builder/image/bin/get-app-config
 builder/image/bin/get-app-values
 builder/image/bin/publish-release-controller
 builder/image/bin/yaml2json-procfile
-cache/image/bin
+cache/image/bin/
 client/dist/
 client/makeself/
 contrib/azure/azure-user-data
@@ -50,6 +50,7 @@ logspout/Godeps/
 publisher/Godeps/
 publisher/image/bin/publisher
 router/Godeps/
+swarm/image/bin/
 
 # coverage reports
 .coverage

Makefile

@@ -10,7 +10,7 @@ repo_path = github.com/deis/deis
 GO_PACKAGES = pkg/time version
 GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
 
-COMPONENTS=builder cache controller database logger logspout publisher registry router store
+COMPONENTS=builder cache controller database logger logspout publisher registry router store swarm
 START_ORDER=publisher store logger logspout database cache registry controller builder router
 CLIENTS=client deisctl
 

swarm/Dockerfile

@@ -5,20 +5,8 @@ RUN git clone https://github.com/deis/swarm
 WORKDIR /go/src/github.com/docker/swarm
 RUN git fetch origin nodefailover
 RUN git checkout nodefailover
+
 ENV GOPATH /go/src/github.com/docker/swarm/Godeps/_workspace:$GOPATH
-RUN CGO_ENABLED=0 go install -v -a -tags netgo -ldflags "-w -X github.com/docker/swarm/version.GITCOMMIT `git rev-parse --short HEAD`"
-WORKDIR /go/src/github.com/deis
-RUN git clone https://github.com/deis/deis
-WORKDIR /go/src/github.com/deis/deis
-RUN git fetch origin swarm
-RUN git checkout swarm
-WORKDIR /go/src/github.com/deis/deis/swarm
-RUN mv /go/bin/swarm /bin/deis-swarm
-RUN chmod +x /bin/deis-swarm
-ENV GOPATH /go/src/github.com/deis/deis/Godeps/_workspace:$GOPATH
-RUN CGO_ENABLED=0 go install -v -a "github.com/deis/deis/swarm"
-ENV SWARM_HOST :2375
-EXPOSE 2375
-VOLUME $HOME/.deis-swarm
-ENTRYPOINT ["swarm"]
-CMD ["--help”]
+RUN CGO_ENABLED=0 go build -a -tags netgo -installsuffix cgo \
+    -ldflags "-s -w -X github.com/docker/swarm/version.GITCOMMIT `git rev-parse --short HEAD`" \
+    -o deis-swarm

swarm/Makefile

@@ -0,0 +1,76 @@
+include ../includes.mk
+
+# the filepath to this repository, relative to $GOPATH/src
+repo_path = github.com/deis/deis/swarm
+
+GO_FILES = swarm.go
+GO_PACKAGES =
+GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
+
+COMPONENT = $(notdir $(repo_path))
+IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
+DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
+BUILD_IMAGE = $(COMPONENT)-build
+BINARY_DEST_DIR = image/bin
+
+build: check-docker
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' -o $(BINARY_DEST_DIR)/swarm || exit 1
+	@$(call check-static-binary,$(BINARY_DEST_DIR)/swarm)
+	docker build -t $(BUILD_IMAGE) .
+	docker cp `docker run -d $(BUILD_IMAGE)`:/go/src/github.com/docker/swarm/deis-swarm $(BINARY_DEST_DIR)/
+	@$(call check-static-binary,$(BINARY_DEST_DIR)/deis-swarm)
+	docker build -t $(IMAGE) image
+
+clean: check-docker check-registry
+	rm -f $(BINARY_DEST_DIR)/deis-swarm
+	rm -f $(BINARY_DEST_DIR)/swarm
+	-docker rmi -f $(BUILD_IMAGE)
+	-docker rmi -f $(IMAGE)
+
+full-clean: check-docker check-registry
+	docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
+
+install: check-deisctl
+	deisctl install $(COMPONENT)
+
+uninstall: check-deisctl
+	deisctl uninstall $(COMPONENT)
+
+start: check-deisctl
+	deisctl start $(COMPONENT)
+
+stop: check-deisctl
+	deisctl stop $(COMPONENT)
+
+restart: stop start
+
+run: install start
+
+dev-release: push set-image
+
+push: check-registry
+	docker tag -f $(IMAGE) $(DEV_IMAGE)
+	docker push $(DEV_IMAGE)
+
+set-image: check-deisctl
+	deisctl config $(COMPONENT) set image=$(DEV_IMAGE)
+
+release:
+	docker push $(IMAGE)
+
+deploy: build dev-release restart
+
+test: test-style test-unit test-functional
+
+test-unit:
+	@echo no unit tests
+
+test-style:
+# display output, then check
+	$(GOFMT) $(GO_PACKAGES) $(GO_FILES)
+	@$(GOFMT) $(GO_PACKAGES) $(GO_FILES) | read; if [ $$? == 0 ]; then echo "gofmt check failed."; exit 1; fi
+	$(GOVET) $(repo_path) $(GO_PACKAGES_REPO_PATH)
+	$(GOLINT) ./...
+
+test-functional:
+	@echo no functional tests

swarm/image/Dockerfile

@@ -0,0 +1,12 @@
+FROM busybox
+
+COPY bin /app/bin/
+WORKDIR /app/bin
+
+ENTRYPOINT ["/app/bin/swarm"]
+CMD ["--help"]
+ENV SWARM_HOST :2375
+EXPOSE 2375
+VOLUME $HOME/.swarm
+
+ENV DEIS_RELEASE 1.6.0-dev

swarm/swarm.go

@@ -86,9 +86,9 @@ func main() {
 	client := etcd.NewClient([]string{"http://" + etcdhost + ":" + etcdport})
 	switch os.Args[1] {
 	case "join":
-		run("deis-swarm join " + addr + " " + etcdproto)
+		run("./deis-swarm join " + addr + " " + etcdproto)
 	case "manage":
 		go publishService(client, etcdhost, uint64(ttl.Seconds()))
-		run("deis-swarm manage " + etcdproto)
+		run("./deis-swarm manage " + etcdproto)
 	}
 }