From 386bb8a9b9ba8bc18725085fc8916afa256cd58d Mon Sep 17 00:00:00 2001
From: Zachary Wasserman <zachwass2000@gmail.com>
Date: Wed, 8 Aug 2018 16:21:49 -0700
Subject: [PATCH] Add fleetctl to generated Docker images (#1896)

---
 .dockerignore | 2 +-
 Dockerfile    | 2 +-
 Makefile      | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index eb18a6ea70..b355fcc9c7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,2 @@
 *
-!build/linux/fleet
+!build/
diff --git a/Dockerfile b/Dockerfile
index 25da164ac8..bfa6febe35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,6 @@ MAINTAINER Kolide Developers <engineering@kolide.co>
 
 RUN apk --update add ca-certificates
 
-COPY ./build/linux/fleet /usr/bin/fleet
+COPY ./build/binary-bundle/linux/fleet ./build/binary-bundle/linux/fleetctl /usr/bin/
 
 CMD ["fleet", "serve"]
diff --git a/Makefile b/Makefile
index c49682326f..9f14c0b898 100644
--- a/Makefile
+++ b/Makefile
@@ -176,8 +176,7 @@ else
 	rm -f assets/bundle.js
 endif
 
-docker-build-release: .pre-fleet generate
-	GOOS=linux go build -i -o build/linux/${OUTPUT} -ldflags ${KIT_VERSION} ./cmd/fleet
+docker-build-release: xp-fleet xp-fleetctl
 	docker build -t "${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" .
 	docker tag "${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" kolide/fleet:latest