Merge pull request #3684 from bacongobbler/builder-overhaul

ref(builder): organize for docker best practices

Author: Matthew Fisher

.gitignore

@@ -22,15 +22,7 @@ controller/.secret_key
 logs/
 
 # local binaries, installers, and artifacts
-builder/Godeps/
-builder/image/bin/extract-domain
-builder/image/bin/extract-types
-builder/image/bin/extract-version
-builder/image/bin/generate-buildhook
-builder/image/bin/get-app-config
-builder/image/bin/get-app-values
-builder/image/bin/publish-release-controller
-builder/image/bin/yaml2json-procfile
+builder/rootfs/usr/bin
 cache/image/bin/
 client/dist/
 client/makeself/

builder/.dockerignore

@@ -4,21 +4,21 @@ include ../includes.mk
 repo_path = github.com/deis/deis/builder
 
 GO_FILES = types.go utils.go utils_test.go
-GO_PACKAGES = bin tests
+GO_PACKAGES = src tests
 GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
 
 COMPONENT = $(notdir $(repo_path))
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
 DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
 BINARIES := extract-domain extract-types extract-version generate-buildhook get-app-config get-app-values publish-release-controller yaml2json-procfile
-BINARY_DEST_DIR := image/bin
+BINARY_DEST_DIR := rootfs/usr/bin
 
 build: check-docker
 	for i in $(BINARIES); do \
-		GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' -o $(BINARY_DEST_DIR)/$$i bin/$$i.go || exit 1; \
+		GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' -o $(BINARY_DEST_DIR)/$$i src/$$i.go || exit 1; \
 		$(call check-static-binary,$(BINARY_DEST_DIR)/$$i) \
 	done
-	docker build -t $(IMAGE) image
+	docker build -t $(IMAGE) rootfs
 
 clean: check-docker check-registry
 	for i in $(BINARIES); do \
@@ -66,7 +66,7 @@ test-unit:
 
 test-functional:
 	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
-	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
+	godep go test -v ./tests/...
 
 test-style:
 # display output, then check

builder/Makefile

@@ -44,9 +44,9 @@ RUN chown -R $GITUSER:$GITUSER $GITHOME
 # use VOLUME to remove /var/lib/docker from copy-on-write for performance
 # we don't want to stack overlay filesystems
 VOLUME /var/lib/docker
-WORKDIR /app
-ENTRYPOINT ["/app/bin/entry"]
-CMD ["/app/bin/boot"]
+
+ENTRYPOINT ["/bin/entry"]
+CMD ["/bin/boot"]
 EXPOSE 22
 RUN addgroup -g 2000 slug && adduser -D -u 2000 -G slug slug
 
@@ -57,9 +57,6 @@ RUN addgroup $GITUSER docker
 RUN addgroup $GITUSER slug
 RUN passwd -u git
 
-ADD templates/shim.dockerfile /home/git/
-ADD etc /etc
-ADD . /app
-RUN chown -R root:root /app
+COPY . /
 
 ENV DEIS_RELEASE 1.7.0-dev

builder/image/Dockerfile builder/rootfs/Dockerfilebuilder/image/Dockerfile renamed to builder/rootfs/Dockerfile

@@ -41,13 +41,13 @@ function etcd_safe_mkdir {
 etcd_safe_mkdir $ETCD_PATH/users
 
 # wait for confd to run once and install initial templates
-until confd -onetime -node $ETCD --confdir /app --log-level error; do
+until confd -onetime -node $ETCD --log-level error; do
 	echo "builder: waiting for confd to write initial templates..."
 	sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD --confdir /app --log-level error --interval 5 &
+confd -node $ETCD --log-level error --interval 5 &
 CONFD_PID=$!
 
 # remove any pre-existing docker.sock
@@ -60,10 +60,6 @@ if [[ "$fstype" == "overlay" ]]; then
 	DRIVER_OVERRIDE="--storage-driver=overlay"
 fi
 
-# cheat
-cp /app/bin/apparmor_parser /sbin/apparmor_parser
-cp /app/bin/auplink /sbin/auplink
-
 # spawn a docker daemon to run builds
 docker -d --bip=172.19.42.1/16 $DRIVER_OVERRIDE --insecure-registry 10.0.0.0/8 --insecure-registry 172.16.0.0/12 --insecure-registry 192.168.0.0/16 --insecure-registry 100.64.0.0/10 &
 DOCKER_PID=$!
@@ -74,8 +70,8 @@ while [[ ! -e /var/run/docker.sock ]]; do
 done
 
 # build required images
-docker build -t deis/slugbuilder /app/slugbuilder/
-docker build -t deis/slugrunner /app/slugrunner/
+docker build -t deis/slugbuilder /usr/local/src/slugbuilder/
+docker build -t deis/slugrunner /usr/local/src/slugrunner/
 
 # start an SSH daemon to process `git push` requests
 /usr/sbin/sshd -D -e &