diff --git a/.sandstorm/Vagrantfile b/.sandstorm/Vagrantfile index 20c01b6..bce38b6 100644 --- a/.sandstorm/Vagrantfile +++ b/.sandstorm/Vagrantfile @@ -9,9 +9,14 @@ VM_NAME = File.basename(File.dirname(File.dirname(__FILE__))) + "_sandstorm_#{Ti # Vagrantfile API/syntax version. Don't touch unless you know what you're doing! VAGRANTFILE_API_VERSION = "2" +unless Vagrant::DEFAULT_SERVER_URL.frozen? + Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com') +end + Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Base on the Sandstorm snapshots of the official Debian 8 (jessie) box. - config.vm.box = "sandstorm/debian-jessie64" + config.vm.box = "debian/contrib-stretch64" + config.vm.box_version = "9.3.0" if Vagrant.has_plugin?("vagrant-vbguest") then # vagrant-vbguest is a Vagrant plugin that upgrades diff --git a/.sandstorm/global-setup.sh b/.sandstorm/global-setup.sh index 219c770..d08e19d 100755 --- a/.sandstorm/global-setup.sh +++ b/.sandstorm/global-setup.sh @@ -8,7 +8,9 @@ set -euo pipefail CURL_OPTS="--silent --show-error" echo localhost > /etc/hostname hostname localhost - +# Install curl that is needed below. +apt-get -y update +apt-get install -y curl # The following line copies stderr through stderr to cat without accidentally leaving it in the # output file. Be careful when changing. See: https://github.com/sandstorm-io/vagrant-spk/pull/159 curl $CURL_OPTS https://install.sandstorm.io/ 2>&1 > /host-dot-sandstorm/caches/install.sh | cat diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh index 8b2334b..f77fd34 100755 --- a/.sandstorm/setup.sh +++ b/.sandstorm/setup.sh @@ -8,24 +8,6 @@ set -euo pipefail apt-get update apt-get install -y git -### Download & compile capnproto and the Sandstorm getPublicId helper. - -# First, get capnproto from master and install it to -# /usr/local/bin. This requires a C++ compiler. We opt for clang -# because that's what Sandstorm is typically compiled with. -if [ ! -e /usr/local/bin/capnp ] ; then - sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -q clang autoconf pkg-config libtool - cd /tmp - curl -O https://capnproto.org/capnproto-c++-0.6.0.tar.gz - tar zxf capnproto-c++-0.6.0.tar.gz - cd capnproto-c++-0.6.0 - ./configure - make -j6 check - make install -fi - -### Download & compile capnproto and the Sandstorm getPublicId helper. - # First, get capnproto from master and install it to # /usr/local/bin. This requires a C++ compiler. We opt for clang # because that's what Sandstorm is typically compiled with. @@ -34,7 +16,7 @@ if [ ! -e /usr/local/bin/capnp ] ; then cd /tmp if [ ! -e capnproto ]; then git clone https://github.com/sandstorm-io/capnproto; fi cd capnproto - git checkout master + git checkout f73ac9f6667d7b87c395d23f3753dde63937cf00 cd c++ autoreconf -i ./configure @@ -59,7 +41,7 @@ apt-get install -y python-pip asciidoctor pip install pygments cd /tmp -wget https://github.com/spf13/hugo/releases/download/v0.20/hugo_0.20.7-64bit.deb -O hugo.deb +wget https://github.com/gohugoio/hugo/releases/download/v0.49.2/hugo_0.49.2_Linux-64bit.deb -O hugo.deb dpkg -i hugo.deb rm hugo.deb # cd /tmp