From f6e90a7de53f687338b674c1311298656138235b Mon Sep 17 00:00:00 2001
From: Jacob Cody Wimer <jacob.wimer@gmail.com>
Date: Tue, 23 Jan 2018 10:51:52 -0500
Subject: [PATCH] Changed line endings and alined build script apt-gets in a
 managable manner

---
 setup/build.sh | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/setup/build.sh b/setup/build.sh
index 407ff5c..16c64e6 100644
--- a/setup/build.sh
+++ b/setup/build.sh
@@ -1,16 +1,31 @@
 #!/usr/bin/env bash
-apt-get update
-apt-get install software-properties-common python-software-properties curl git -y
+
+# Docker versions
+COMPOSE_VERSION='1.15.0'
+DOCKER_VERSION='17.06.2'
+
 add-apt-repository ppa:ondrej/php -y
-apt-get update
-apt-get install php7.1 php7.1-common -y
-apt-get install php7.1-curl php7.1-xml php7.1-zip php7.1-gd php7.1-mysql php7.1-mbstring -y
-apt-get install apache2-utils -y
+apt-get update -qq
+apt-get install -y -qq \
+	software-properties-common \
+	python-software-properties \
+	curl \
+	git \
+	php7.1 \
+	php7.1-common
+	php7.1-curl \
+	php7.1-xml \
+	php7.1-zip \
+	php7.1-gd \
+	php7.1-mysql \
+	php7.1-mbstring 
+	apache2-utils 
 wget -qO- https://toolbelt.heroku.com/install-ubuntu.sh | sh
 
-#Docker install
-curl -sSL https://get.docker.com/ | sh
-usermod -aG docker vagrant
-curl -L https://github.com/docker/compose/releases/download/1.8.0/docker-compose-`uname -s`-`uname -m` > docker-compose
-mv docker-compose /usr/local/bin/
-chmod +x /usr/local/bin/docker-compose
\ No newline at end of file
+# Install docker and compose
+apt-get update
+apt-get install -y -qq docker-ce=${DOCKER_VERSION}~ce-0~ubuntu
+curl -L https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m) > /usr/local/bin/docker-compose
+chmod +x /usr/local/bin/docker-compose
+# Add ubuntu to docker group
+usermod -a -G docker vagrant