Update dependencies and box

This commit is contained in:
Łukasz Kurowski 2018-10-26 00:59:48 +02:00
parent 6a8a0925df
commit ddf624cdb7
3 changed files with 11 additions and 22 deletions

View File

@ -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/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2" 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| Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Base on the Sandstorm snapshots of the official Debian 8 (jessie) box. # 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 if Vagrant.has_plugin?("vagrant-vbguest") then
# vagrant-vbguest is a Vagrant plugin that upgrades # vagrant-vbguest is a Vagrant plugin that upgrades

View File

@ -8,7 +8,9 @@ set -euo pipefail
CURL_OPTS="--silent --show-error" CURL_OPTS="--silent --show-error"
echo localhost > /etc/hostname echo localhost > /etc/hostname
hostname localhost 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 # 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 # 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 curl $CURL_OPTS https://install.sandstorm.io/ 2>&1 > /host-dot-sandstorm/caches/install.sh | cat

View File

@ -8,24 +8,6 @@ set -euo pipefail
apt-get update apt-get update
apt-get install -y git 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 # First, get capnproto from master and install it to
# /usr/local/bin. This requires a C++ compiler. We opt for clang # /usr/local/bin. This requires a C++ compiler. We opt for clang
# because that's what Sandstorm is typically compiled with. # because that's what Sandstorm is typically compiled with.
@ -34,7 +16,7 @@ if [ ! -e /usr/local/bin/capnp ] ; then
cd /tmp cd /tmp
if [ ! -e capnproto ]; then git clone https://github.com/sandstorm-io/capnproto; fi if [ ! -e capnproto ]; then git clone https://github.com/sandstorm-io/capnproto; fi
cd capnproto cd capnproto
git checkout master git checkout f73ac9f6667d7b87c395d23f3753dde63937cf00
cd c++ cd c++
autoreconf -i autoreconf -i
./configure ./configure
@ -59,7 +41,7 @@ apt-get install -y python-pip asciidoctor
pip install pygments pip install pygments
cd /tmp 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 dpkg -i hugo.deb
rm hugo.deb rm hugo.deb
# cd /tmp # cd /tmp