From cee6fe3593809712f14f74e9d9c0b1ab66dd5415 Mon Sep 17 00:00:00 2001
From: Joshua Dugie <joshuadugie@users.noreply.github.com>
Date: Sun, 8 Sep 2019 17:04:48 +0000
Subject: [PATCH] Fix several issues in Vagrant provisioning (#1046)

* Fixes to Vagrantfile
---
 Vagrantfile                                       | 15 ++++++++++++---
 prepare.sh                                        |  2 +-
 ...install_docker_ubuntu.sh => install_docker.sh} | 10 +++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)
 rename scripts/{install_docker_ubuntu.sh => install_docker.sh} (81%)

diff --git a/Vagrantfile b/Vagrantfile
index 9496dd1..642d0c1 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,9 +1,18 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# Install tmux and virtualenv to support development
+# Install tmux, virtualenv, and mariadb-server to support development
 $preProvision= <<SCRIPT
-sudo apt-get install tmux virtualenvwrapper mariadb-server -y
+# Prevent attempt to access stdin, causing dpkg-reconfigure error output
+export DEBIAN_FRONTEND=noninteractive
+apt-get install -y tmux virtualenvwrapper
+
+# As per instructions at https://downloads.mariadb.org/mariadb/repositories
+apt-get install -y software-properties-common
+apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 2>&1
+add-apt-repository -y 'deb [arch=amd64,arm64,i386,ppc64el] http://mirror.lstn.net/mariadb/repo/10.4/ubuntu xenial main'
+apt-get update
+apt-get install -y mariadb-server
 SCRIPT
 
 # Wrap provisioning script with a virutalenv for pip packages
@@ -59,6 +68,6 @@ Vagrant.configure("2") do |config|
                       run: "always"
 
   # Install docker (convenience)
-  config.vm.provision "shell", path: "scripts/install_docker_ubuntu.sh"
+  config.vm.provision "shell", path: "scripts/install_docker.sh", privileged: false
 
 end
diff --git a/prepare.sh b/prepare.sh
index bcc8dd9..0563149 100755
--- a/prepare.sh
+++ b/prepare.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 sudo apt-get update
-sudo apt-get install build-essential python-dev python-pip libffi-dev -y
+sudo DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential python-dev python-pip libffi-dev
 pip install -r requirements.txt
diff --git a/scripts/install_docker_ubuntu.sh b/scripts/install_docker.sh
similarity index 81%
rename from scripts/install_docker_ubuntu.sh
rename to scripts/install_docker.sh
index e4eb745..98717e7 100644
--- a/scripts/install_docker_ubuntu.sh
+++ b/scripts/install_docker.sh
@@ -4,8 +4,8 @@
 # per: https://docs.docker.com/engine/installation/linux/debian/#install-docker-ce
 
 # Install packages to allow apt to use a repository over HTTPS
-sudo apt-get install -y \
-    python-pip
+sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    python-pip \
     apt-transport-https \
     ca-certificates \
     curl \
@@ -25,14 +25,14 @@ sudo add-apt-repository \
 sudo apt-get update
 
 # Install the latest version of Docker
-sudo apt-get install -y docker-ce
+sudo DEBIAN_FRONTEND=noninteractive apt-get install -y docker-ce
 
 # Add user to the docker group
 # Warning: The docker group grants privileges equivalent to the root user. 
-sudo usermod -aG docker ubuntu
+sudo usermod -aG docker ${USER}
 
 # Configure Docker to start on boot
 sudo systemctl enable docker
 
 # Install docker-compose
-sudo pip install docker-compose
+pip install docker-compose