diff --git a/vagrant/README.md b/vagrant/README.md index dfd8cfb..8ab4415 100644 --- a/vagrant/README.md +++ b/vagrant/README.md @@ -14,14 +14,14 @@ Using 1. Install vagrant 2. Install vagrant plugins: -```sh +``` vagrant plugin install vagrant-vbguest vagrant plugin install vagrant-reload ``` **Launch**: -```sh +``` cd vagrant/fedora vagrant up ``` @@ -32,12 +32,14 @@ to install all the packages and reboot at least once. You may want to use `vagrant halt` instead of `destroy` to suspend the VM until you're done with dev/test. -The root of the project will be mounted as a host folder to `/src`. +The root of the project will be mounted as a host folder to `/vault-token-helper`. Run tests from an SSH or GUI Terminal session in the fedora VM: -```sh -cd /src +``` +cd /vault-token-helper +make test +# or: go test -v ./... ``` @@ -49,7 +51,7 @@ go test -v ./... **Launch**: -```sh +``` cd vagrant/windows vagrant up ``` diff --git a/vagrant/fedora/Vagrantfile b/vagrant/fedora/Vagrantfile index a6b1663..f421374 100644 --- a/vagrant/fedora/Vagrantfile +++ b/vagrant/fedora/Vagrantfile @@ -5,13 +5,13 @@ # Vagrant.configure("2") do |config| - # https://app.vagrantup.com/generic/boxes/fedora29 - config.vm.box = "generic/fedora29" - config.vm.box_version = "1.9.14" + # https://app.vagrantup.com/generic/boxes/fedora32 + config.vm.box = "generic/fedora32" + config.vm.box_version = '3.0.2' config.vm.provider "virtualbox" do |vb| vb.gui = true - vb.memory = 1024 + vb.memory = 2048 vb.cpus = 2 vb.customize ["modifyvm", :id, "--vram", "128"] vb.customize ["modifyvm", :id, "--accelerate3d", "off"] @@ -44,17 +44,14 @@ SHELL # pass config.vm.provision "shell", inline: "sudo dnf install -y pass" - config.vm.provision "shell", inline: <<-SHELL - sudo rpm --import https://mirror.go-repo.io/fedora/RPM-GPG-KEY-GO-REPO - curl -s https://mirror.go-repo.io/fedora/go-repo.repo | sudo tee /etc/yum.repos.d/go-repo.repo - sudo dnf install -y golang -SHELL + # install go + config.vm.provision "shell", inline: "sudo dnf install -y golang" # vagrant plugin install vagrant-reload config.vm.provision :reload - # mount the project into /src - config.vm.synced_folder "../..", "/src" + # mount the project into /vault-token-helper + config.vm.synced_folder "../..", "/vault-token-helper" # TODO: remove below when done using local fork - config.vm.synced_folder "../../../keyring", "/keyring" + # config.vm.synced_folder "../../../keyring", "/keyring" end \ No newline at end of file