diff --git a/libnetwork/docs/Vagrantfile b/libnetwork/docs/Vagrantfile index 8f1f8e1c04..55d665f195 100644 --- a/libnetwork/docs/Vagrantfile +++ b/libnetwork/docs/Vagrantfile @@ -20,11 +20,12 @@ apt-get -y install bridge-utils wget -qO- https://experimental.docker.com/ | sh gpasswd -a vagrant docker echo DOCKER_OPTS=\\"--default-network=overlay:multihost --kv-store=consul:192.168.33.10:8500 --label=com.docker.network.driver.overlay.bind_interface=eth1 --label=com.docker.network.driver.overlay.neighbor_ip=192.168.33.11\\" >> /etc/default/docker -service docker restart +cp /vagrant/vagrant-systemd/docker.service /etc/systemd/system/ +systemctl daemon-reload +systemctl restart docker.service SCRIPT Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'" num_nodes = 2 base_ip = "192.168.33." @@ -42,7 +43,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| num_nodes.times do |n| config.vm.define "net-#{n+1}" do |net| - net.vm.box = "chef/ubuntu-14.10" + net.vm.box = "ubuntu/vivid64" net_ip = net_ips[n] net_index = n+1 net.vm.hostname = "net-#{net_index}" diff --git a/libnetwork/docs/vagrant-systemd/docker.service b/libnetwork/docs/vagrant-systemd/docker.service new file mode 100644 index 0000000000..f17b7848f5 --- /dev/null +++ b/libnetwork/docs/vagrant-systemd/docker.service @@ -0,0 +1,16 @@ +[Unit] +Description=Docker Application Container Engine +Documentation=https://docs.docker.com +After=network.target docker.socket +Requires=docker.socket + +[Service] +EnvironmentFile=-/etc/default/docker +ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS +MountFlags=slave +LimitNOFILE=1048576 +LimitNPROC=1048576 +LimitCORE=infinity + +[Install] +WantedBy=multi-user.target