From 11a4664901d0ee761c5bf4dc78f7e10de09cc0f2 Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Fri, 22 Apr 2022 16:54:59 -0500 Subject: [PATCH] ci: Set up docker to use Go vagrant too --- test/vagrant-spec/scripts/ubuntu-run.docker.sh | 9 ++++++++- test/vagrant-spec/scripts/ubuntu-run.virtualbox.sh | 1 - test/vagrant-spec/scripts/ubuntu-setup.docker.sh | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/test/vagrant-spec/scripts/ubuntu-run.docker.sh b/test/vagrant-spec/scripts/ubuntu-run.docker.sh index 640f4a81d..5ef7524a6 100644 --- a/test/vagrant-spec/scripts/ubuntu-run.docker.sh +++ b/test/vagrant-spec/scripts/ubuntu-run.docker.sh @@ -1,7 +1,14 @@ #!/bin/bash -set -x export VAGRANT_SPEC_DOCKER_IMAGE="${VAGRANT_SPEC_DOCKER_IMAGE}" + +# Explicitly use Go binary +export VAGRANT_PATH=/vagrant/vagrant + +# Explicitly set high open file limits... vagrant-ruby tends to run into the +# default 1024 limit during some operations. +ulimit -n 65535 + vagrant-spec ${VAGRANT_SPEC_ARGS} --config /vagrant/test/vagrant-spec/configs/vagrant-spec.config.docker.rb result=$? diff --git a/test/vagrant-spec/scripts/ubuntu-run.virtualbox.sh b/test/vagrant-spec/scripts/ubuntu-run.virtualbox.sh index da59855ca..9de1436f5 100644 --- a/test/vagrant-spec/scripts/ubuntu-run.virtualbox.sh +++ b/test/vagrant-spec/scripts/ubuntu-run.virtualbox.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -x export VAGRANT_EXPERIMENTAL="${VAGRANT_EXPERIMENTAL:-1}" export VAGRANT_SPEC_BOX="${VAGRANT_SPEC_BOX}" diff --git a/test/vagrant-spec/scripts/ubuntu-setup.docker.sh b/test/vagrant-spec/scripts/ubuntu-setup.docker.sh index 1e0de689b..d83d55bb2 100644 --- a/test/vagrant-spec/scripts/ubuntu-setup.docker.sh +++ b/test/vagrant-spec/scripts/ubuntu-setup.docker.sh @@ -1,7 +1,7 @@ #!/bin/bash -set -xe +set -e -apt-get update +apt-get update -q apt-get install -qq -y --force-yes curl apt-transport-https apt-get purge -qq -y lxc-docker* || true curl -sSL https://get.docker.com/ | sh