From bf6c6b3a4087cdc3d0bd1bd5b377536fee6efd0f Mon Sep 17 00:00:00 2001
From: Zachary Wasserman <zachwass2000@gmail.com>
Date: Tue, 4 Jun 2019 10:42:41 -0700
Subject: [PATCH] Update docs and Makefile to use Github releases for binaries
 (#2055)

---
 Makefile                                |  2 +-
 docs/infrastructure/fleet-on-centos.md  | 12 ++++++------
 docs/infrastructure/fleet-on-ubuntu.md  |  4 ++--
 docs/infrastructure/installing-fleet.md |  6 +++---
 docs/infrastructure/updating-fleet.md   | 20 ++++++++++++++++++--
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 9f14c0b89..1f81b2a55 100644
--- a/Makefile
+++ b/Makefile
@@ -218,4 +218,4 @@ xp-fleetctl: .pre-binary-bundle .pre-fleetctl generate
 
 binary-bundle: xp-fleet xp-fleetctl
 	cd build/binary-bundle && zip -r "fleet_${VERSION}.zip" darwin/ linux/ windows/
-	cp build/binary-bundle/fleet_${VERSION}.zip build/binary-bundle/fleet_latest.zip
+	cp build/binary-bundle/fleet_${VERSION}.zip build/binary-bundle/fleet.zip
diff --git a/docs/infrastructure/fleet-on-centos.md b/docs/infrastructure/fleet-on-centos.md
index d89e3b49a..850339314 100644
--- a/docs/infrastructure/fleet-on-centos.md
+++ b/docs/infrastructure/fleet-on-centos.md
@@ -21,8 +21,8 @@ $ vagrant ssh
 To install Fleet, run the following:
 
 ```
-$ wget https://dl.kolide.co/bin/fleet_latest.zip
-$ unzip fleet_latest.zip 'linux/*' -d fleet
+$ wget https://github.com/kolide/fleet/releases/latest/download/fleet.zip
+$ unzip fleet.zip 'linux/*' -d fleet
 $ sudo cp fleet/linux/fleet* /usr/bin/
 ```
 
@@ -45,10 +45,10 @@ To start the MySQL service:
 $ sudo systemctl start mysqld
 ```
 
-Let's set a password for the MySQL root user. 
+Let's set a password for the MySQL root user.
 MySQL creates an initial temporary root password which you can find in  ```/var/log/mysqld.log``` you will need this password to change the root password.
 
-Connect to MySQL  
+Connect to MySQL
 ```
 $ mysql -u root -p
 ```
@@ -75,9 +75,9 @@ And exit MySQL
 ```
 mysql> exit
 ```
-Stop MySQL and start again  
+Stop MySQL and start again
 ```
-$ sudo mysqld stop  
+$ sudo mysqld stop
 $ sudo systemctl start mysqld
 ```
 It's also worth creating a MySQL database for us to use at this point. Run the following to create the `kolide` database in MySQL. Note that you will be prompted for the password you created above.
diff --git a/docs/infrastructure/fleet-on-ubuntu.md b/docs/infrastructure/fleet-on-ubuntu.md
index 45359bdbc..6f9d9904f 100644
--- a/docs/infrastructure/fleet-on-ubuntu.md
+++ b/docs/infrastructure/fleet-on-ubuntu.md
@@ -21,8 +21,8 @@ $ vagrant ssh
 To install Fleet, run the following:
 
 ```
-$ wget https://dl.kolide.co/bin/fleet_latest.zip
-$ unzip fleet_latest.zip 'linux/*' -d fleet
+$ wget https://github.com/kolide/fleet/releases/latest/download/fleet.zip
+$ unzip fleet.zip 'linux/*' -d fleet
 $ sudo cp fleet/linux/fleet /usr/bin/fleet
 $ sudo cp fleet/linux/fleetctl /usr/bin/fleetctl
 ```
diff --git a/docs/infrastructure/installing-fleet.md b/docs/infrastructure/installing-fleet.md
index 71c4bfd1e..9412827b5 100644
--- a/docs/infrastructure/installing-fleet.md
+++ b/docs/infrastructure/installing-fleet.md
@@ -28,18 +28,18 @@ For more information on using Fleet, refer to the [Configuring The Fleet Binary]
 Download the latest raw Fleet binaries:
 
 ```
-curl -O https://dl.kolide.co/bin/fleet_latest.zip
+curl -O https://github.com/kolide/fleet/releases/latest/download/fleet.zip
 ```
 
 Unzip the binaries for your platform:
 
 ```
 # For a Darwin compatible binary
-unzip fleet_latest.zip 'darwin/*' -d fleet
+unzip fleet.zip 'darwin/*' -d fleet
 ./fleet/darwin/fleet_darwin_amd64 --help
 
 # For a Linux compatible binary
-unzip fleet_latest.zip 'linux/*' -d fleet
+unzip fleet.zip 'linux/*' -d fleet
 ./fleet/linux/fleet_linux_amd64 --help
 ```
 
diff --git a/docs/infrastructure/updating-fleet.md b/docs/infrastructure/updating-fleet.md
index 78c82a07e..b355d6d92 100644
--- a/docs/infrastructure/updating-fleet.md
+++ b/docs/infrastructure/updating-fleet.md
@@ -16,9 +16,25 @@ Follow the binary update instructions corresponding to the original installation
 
 #### Raw binaries
 
-Download and unzip the Fleet binaries from [github.com/kolide/fleet/releases](https://github.com/kolide/fleet/releases).
+Download the latest raw Fleet binaries:
 
-Replace the existing Fleet binary with the appropriate binary for your platform.
+```
+curl -O https://github.com/kolide/fleet/releases/latest/download/fleet.zip
+```
+
+Unzip the binaries for your platform:
+
+```
+# For a Darwin compatible binary
+unzip fleet.zip 'darwin/*' -d fleet
+./fleet/darwin/fleet --help
+
+# For a Linux compatible binary
+unzip fleet.zip 'linux/*' -d fleet
+./fleet/linux/fleet --help
+```
+
+Replace the existing Fleet binary with the newly unzipped binary.
 
 #### Docker container