fix(boot.go,Makefile,Dockerfile): merge builder into a single binary

the git-receive hook and the server are accessed via commands

Author: arschles

Makefile

@@ -39,9 +39,7 @@ bootstrap:
 # the build as a `docker build`.
 build:
 	${DEV_ENV_PREFIX} -e CGO_ENABLED=0 ${DEV_ENV_IMAGE} go build -a -installsuffix cgo -ldflags '-s' -o $(BINARY_DEST_DIR)/boot boot.go || exit 1
-	@$(call check-static-binary,$(BINARY_DEST_DIR)/builder)
-	${DEV_ENV_PREFIX} -e CGO_ENABLED=0 ${DEV_ENV_IMAGE} go build -a -installsuffix cgo -ldflags '-s' -o $(BINARY_DEST_DIR)/gitreceive ./gitreceive/main.go || exit 1
-	@$(call check-static-binary,$(BINARY_DEST_DIR)/gitreceive)
+	@$(call check-static-binary,$(BINARY_DEST_DIR)/boot)
 
 test:
 	${DEV_ENV_CMD} go test ./pkg && \

boot.go

@@ -1,26 +1,63 @@
 package main
 
 import (
-	"log"
 	"os"
 	"runtime"
 
+	"github.com/codegangsta/cli"
 	"github.com/deis/builder/fetcher"
 	"github.com/deis/builder/pkg"
-	"github.com/kelseyhightower/envconfig"
+	"github.com/deis/builder/pkg/conf"
+	"github.com/deis/builder/pkg/gitreceive"
+	"github.com/deis/builder/pkg/log"
+	"github.com/deis/builder/pkg/sshd"
+)
+
+const (
+	serverConfAppName     = "deis-builder-server"
+	gitReceiveConfAppName = "deis-builder-git-receive"
 )
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
 }
 
 func main() {
-	var conf Config
-	if err := envconfig.Process("builder", &conf); err != nil {
-		log.Fatalf("error fetching config [%s]", err)
-		os.Exit(1)
+	app := cli.NewApp()
+
+	app.Commands = []cli.Command{
+		{
+			Name:    "server",
+			Aliases: []string{"srv"},
+			Usage:   "Run the git server",
+			Action: func(c *cli.Context) {
+				cnf := new(sshd.Config)
+				if err := conf.EnvConfig(serverConfAppName, cnf); err != nil {
+					log.Err("getting config for %s [%s]", serverConfAppName, err)
+					os.Exit(1)
+				}
+				log.Info("starting fetcher on port %d", cnf.FetcherPort)
+				go fetcher.Serve(cnf.FetcherPort)
+				os.Exit(pkg.Run(cnf.SSHHostIP, cnf.SSHHostPort, "boot"))
+			},
+		},
+		{
+			Name:    "git-receive",
+			Aliases: []string{"gr"},
+			Usage:   "Run the git-receive hook",
+			Action: func(c *cli.Context) {
+				cnf := new(gitreceive.Config)
+				if err := conf.EnvConfig(gitReceiveConfAppName, cnf); err != nil {
+					log.Err("Error getting config for %s [%s]", gitReceiveConfAppName, err)
+					os.Exit(1)
+				}
+				if err := gitreceive.Run(cnf); err != nil {
+					log.Err("running git receive hook [%s]", err)
+					os.Exit(1)
+				}
+			},
+		},
 	}
-	log.Printf("starting fetcher on port %d", conf.FetcherPort)
-	go fetcher.Serve(conf.FetcherPort)
-	os.Exit(pkg.Run(conf.SSHHostIP, conf.SSHHostPort, "boot"))
+
+	app.Run(os.Args)
 }

rootfs/Dockerfile

@@ -41,7 +41,7 @@ RUN chown -R $GITUSER:$GITUSER $GITHOME
 
 
 ADD ./check-repos /home/git/
-ENTRYPOINT ["/bin/boot"]
+ENTRYPOINT ["/bin/boot", "server"]
 EXPOSE 2223
 EXPOSE 3000
 RUN addgroup -g 2000 slug && adduser -D -u 2000 -G slug slug