From: Rafael dos Santos Silva Date: Wed, 13 May 2020 17:53:55 +0000 (-0300) Subject: Remove Vagrant references as they are no longer used X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4ee18c8d227778811716513d0391270a451178dd;p=discourse_docker.git Remove Vagrant references as they are no longer used --- diff --git a/README.md b/README.md index 876a2ad..af71371 100644 --- a/README.md +++ b/README.md @@ -197,23 +197,6 @@ installs you can ensure they are in sync by looking at `/etc/passwd` and - [Linking containers for a multiple container setup](https://meta.discourse.org/t/linking-containers-for-a-multiple-container-setup/20867) - [Using Rubygems mirror to improve connection problem in China](https://meta.discourse.org/t/replace-rubygems-org-with-taobao-mirror-to-resolve-network-error-in-china/21988/1) -### Developing with Vagrant - -If you are looking to make modifications to this repository, you can easily test -out your changes before committing, using the magic of -[Vagrant](http://vagrantup.com). Install Vagrant as per [the default -instructions](http://docs.vagrantup.com/v2/installation/index.html), and -then run: - - vagrant up - -This will spawn a new Ubuntu VM, install Docker, and then await your -instructions. You can then SSH into the VM with `vagrant ssh`, become -`root` with `sudo -i`, and then you're right to go. Your live git repo is -already available at `/vagrant`, so you can just `cd /vagrant` -and then start running `launcher`. - - License === MIT diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 254e141..0000000 --- a/Vagrantfile +++ /dev/null @@ -1,38 +0,0 @@ -Vagrant.configure(2) do |config| - config.vm.provider "virtualbox" do |v| - v.memory = 2048 - v.cpus = 4 - end - - config.vm.define :dockerhost do |config| - config.vm.box = "ubuntu/xenial64" - config.vm.network "private_network", ip: ENV["DISCOURSE_DOCKER_HOST_IP"] || "192.168.33.11" - - if Vagrant.has_plugin?("vagrant-disksize") - config.disksize.size = ENV["DISCOURSE_DOCKER_HOST_DISKSIZE"] || "50GB" - else - raise "The vagrant-disksize plugin required to expand the vm disk size. " + - "Run 'vagrant plugin install vagrant-disksize'." - end - - if ENV["http_proxy"] - config.vm.provision "shell", inline: <<-EOF - echo "Acquire::http::Proxy \\"#{ENV['http_proxy']}\\";" >/etc/apt/apt.conf.d/50proxy - echo "http_proxy=\"#{ENV['http_proxy']}\"" >/etc/profile.d/http_proxy.sh - EOF - end - - config.vm.provision "shell", inline: <<-EOF - set -e - - export DEBIAN_FRONTEND=noninteractive - - echo "en_US.UTF-8 UTF-8" >/etc/locale.gen - locale-gen - echo "Apt::Install-Recommends 'false';" >/etc/apt/apt.conf.d/02no-recommends - echo "Acquire::Languages { 'none' };" >/etc/apt/apt.conf.d/05no-languages - apt-get update - wget -qO- https://get.docker.com/ | sh - EOF - end -end