From 5660330c4c34b6a14bc563c094bd152c18da166e Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 29 May 2020 11:16:35 +0200 Subject: [PATCH] Drop Vagrantfile Nobody in the development team has ever really used that, it needs a ton of dependencies, and doesn't work in toolbox/Silverblue. Our own vm-run/image-customize etc. machinery is efficient enough, and proven to work. Closes #321 --- README.md | 8 -------- Vagrantfile | 30 ------------------------------ 2 files changed, 38 deletions(-) delete mode 100644 Vagrantfile diff --git a/README.md b/README.md index 09e4e5b..ceff4cc 100644 --- a/README.md +++ b/README.md @@ -80,14 +80,6 @@ You can also run the test against a different Cockpit image, for example: TEST_OS=fedora-32 make check -# Vagrant - -This directory contains a Vagrantfile that installs and starts cockpit on a -Fedora 26 cloud image. Run `vagrant up` to start it and `vagrant rsync` to -synchronize the `dist` directory to `/usr/local/share/cockit/starter-kit`. Use -`vagrant rsync-auto` to automatically sync when contents of the `dist` -directory change. - # Customizing After cloning the Starter Kit you should rename the files, package names, and diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index c446c94..0000000 --- a/Vagrantfile +++ /dev/null @@ -1,30 +0,0 @@ -Vagrant.configure(2) do |config| - config.vm.box = "fedora/28-cloud-base" - config.vm.network "forwarded_port", guest: 9090, host: 9090 - - if Dir.glob("dist/*").length == 0 - config.vm.post_up_message = "NOTE: Distribution directory is empty. Run `make` to see your module show up in cockpit" - end - - config.vm.synced_folder ".", "/vagrant", disabled: true - config.vm.synced_folder "dist/", "/usr/local/share/cockpit/" + File.basename(Dir.pwd), type: "rsync", create: true - - config.vm.provider "libvirt" do |libvirt| - libvirt.memory = 1024 - end - - config.vm.provider "virtualbox" do |virtualbox| - virtualbox.memory = 1024 - end - - config.vm.provision "shell", inline: <<-EOF - set -eu - - sudo dnf install -y cockpit - - printf "[WebService]\nAllowUnencrypted=true\n" > /etc/cockpit/cockpit.conf - - systemctl enable cockpit.socket - systemctl start cockpit.socket - EOF -end