make curl more robust

Signed-off-by: MaxPeal <[email protected]>

deploy/vagrant/scripts/tinkerbell.sh

@@ -16,12 +16,12 @@ setup_docker() (
 		gnupg-agent \
 		software-properties-common
 
-	curl -fsSL https://download.docker.com/linux/ubuntu/gpg |
+	curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg |
 		sudo apt-key add -
 
 	local repo
 	repo=$(
-		printf "deb [arch=amd64] https://download.docker.com/linux/ubuntu %s stable" \
+		printf "deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") %s stable" \
 			"$(lsb_release -cs)"
 	)
 	sudo add-apt-repository "$repo"
@@ -32,13 +32,13 @@ setup_docker() (
 
 setup_docker_compose() (
 	# from https://docs.docker.com/compose/install/
-	DOCKER_COMPOSE_DOWNLOAD_LINK=${DOCKER_COMPOSE_DOWNLOAD_LINK:-https://github.com/docker/compose/releases/download/1.26.0/docker-compose-$(uname -s)-$(uname -m)}  # If variable not set or null, use default.
-	"${OSIE_DOWNLOAD_LINK}"
-	sudo curl -L \
+	local DOCKER_COMPOSE_DOWNLOAD_LINK=${DOCKER_COMPOSE_DOWNLOAD_LINK:-"https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)"}  # If variable not set or null, use default.
+	sudo curl -C - -SLR --progress-bar \
 		"${DOCKER_COMPOSE_DOWNLOAD_LINK}" \
 		-o /usr/local/bin/docker-compose
 
 	sudo chmod +x /usr/local/bin/docker-compose
+	docker-compose version
 )
 
 make_certs_writable() (

setup.sh

@@ -257,7 +257,8 @@ setup_osie() (
 		pushd "$SCRATCH"
 
 		if [ -z "${TB_OSIE_TAR:-}" ]; then
-			curl 'https://tinkerbell-oss.s3.amazonaws.com/osie-uploads/latest.tar.gz' -o ./osie.tar.gz
+			local OSIE_DOWNLOAD_LINK=${OSIE_DOWNLOAD_LINK:-"https://tinkerbell-oss.s3.amazonaws.com/osie-uploads/latest.tar.gz"}  # If variable not set or null, use default.
+			curl -C - -SLR --progress-bar "${OSIE_DOWNLOAD_LINK}" -o ./osie.tar.gz
 			tar -zxf osie.tar.gz
 		else
 			tar -zxf "$TB_OSIE_TAR"