Compare commits
No commits in common. "master" and "v1.1.0" have entirely different histories.
20 changed files with 27 additions and 283 deletions
26
CHANGELOG.md
26
CHANGELOG.md
|
|
@ -1,29 +1,3 @@
|
|||
## [1.2.1](https://github.com/fgrehm/vagrant-cachier/compare/v1.2.0...v1.2.1) (July 3, 2015)
|
||||
|
||||
IMPROVEMENTS:
|
||||
|
||||
- Add chef\_zero support to chef bucket [[GH-153]]
|
||||
|
||||
[GH-153]: https://github.com/fgrehm/vagrant-cachier/issues/153
|
||||
|
||||
## [1.2.0](https://github.com/fgrehm/vagrant-cachier/compare/v1.1.0...v1.2.0) (Jan 14, 2015)
|
||||
|
||||
FEATURES:
|
||||
|
||||
- [Chef Gems bucket](http://fgrehm.viewdocs.io/vagrant-cachier/buckets/chef_rubygems) [[GH-129]]
|
||||
|
||||
[GH-129]: https://github.com/fgrehm/vagrant-cachier/pull/129
|
||||
|
||||
BUG FIXES:
|
||||
|
||||
- Fix provisioner resolution on Vagrant 1.7+ [[GH-133]] / [[GH-134]]
|
||||
- Do not modify Vagrant core object, preventing unpredictable behavior [[GH-135]]
|
||||
|
||||
[GH-133]: https://github.com/fgrehm/vagrant-cachier/issues/133
|
||||
[GH-134]: https://github.com/fgrehm/vagrant-cachier/pull/134
|
||||
[GH-135]: https://github.com/fgrehm/vagrant-cachier/pull/135
|
||||
|
||||
|
||||
## [1.1.0](https://github.com/fgrehm/vagrant-cachier/compare/v1.0.0...v1.1.0) (Oct 15, 2014)
|
||||
|
||||
FEATURES:
|
||||
|
|
|
|||
2
Gemfile
2
Gemfile
|
|
@ -1,7 +1,7 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
group :development do
|
||||
gem 'vagrant', github: 'mitchellh/vagrant', tag: 'v1.7.2'
|
||||
gem 'vagrant', github: 'mitchellh/vagrant', tag: 'v1.6.5'
|
||||
gem 'rake'
|
||||
end
|
||||
|
||||
|
|
|
|||
37
Gemfile.lock
37
Gemfile.lock
|
|
@ -1,8 +1,8 @@
|
|||
GIT
|
||||
remote: git://github.com/fgrehm/vagrant-lxc.git
|
||||
revision: c9cd671a32f730fff4b6e4fdd3687a531af0663c
|
||||
revision: 622366bd64e570478fad56908d2869a7dc2f6c3a
|
||||
specs:
|
||||
vagrant-lxc (1.1.0)
|
||||
vagrant-lxc (1.0.1)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/fgrehm/vagrant-pristine.git
|
||||
|
|
@ -12,29 +12,28 @@ GIT
|
|||
|
||||
GIT
|
||||
remote: git://github.com/mitchellh/vagrant.git
|
||||
revision: 1cd667b243f4a263cd5322b6455165cc676b6f7f
|
||||
tag: v1.7.2
|
||||
revision: c38e17cc29f69aaea1610451333396494181a481
|
||||
tag: v1.6.5
|
||||
specs:
|
||||
vagrant (1.7.2)
|
||||
bundler (>= 1.5.2, < 1.8.0)
|
||||
vagrant (1.6.5)
|
||||
bundler (>= 1.5.2, < 1.7.0)
|
||||
childprocess (~> 0.5.0)
|
||||
erubis (~> 2.7.0)
|
||||
hashicorp-checkpoint (~> 0.1.1)
|
||||
i18n (~> 0.6.0)
|
||||
listen (~> 2.8.0)
|
||||
listen (~> 2.7.1)
|
||||
log4r (~> 1.1.9, < 1.1.11)
|
||||
net-scp (~> 1.1.0)
|
||||
net-sftp (~> 2.1)
|
||||
net-ssh (>= 2.6.6, < 2.10.0)
|
||||
nokogiri (= 1.6.3.1)
|
||||
rb-kqueue (~> 0.2.0)
|
||||
rest-client (>= 1.6.0, < 2.0)
|
||||
wdm (~> 0.1.0)
|
||||
winrm (~> 1.1.3)
|
||||
|
||||
PATH
|
||||
remote: .
|
||||
specs:
|
||||
vagrant-cachier (1.1.0)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
|
|
@ -55,11 +54,11 @@ GEM
|
|||
builder (>= 2.1.2)
|
||||
hashicorp-checkpoint (0.1.4)
|
||||
hitimes (1.2.2)
|
||||
httpclient (2.6.0.1)
|
||||
httpclient (2.4.0)
|
||||
httpi (0.9.7)
|
||||
rack
|
||||
i18n (0.6.11)
|
||||
listen (2.8.5)
|
||||
listen (2.7.11)
|
||||
celluloid (>= 0.15.2)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
rb-inotify (>= 0.9)
|
||||
|
|
@ -68,28 +67,21 @@ GEM
|
|||
logging (1.8.2)
|
||||
little-plugger (>= 1.1.3)
|
||||
multi_json (>= 1.8.4)
|
||||
mime-types (2.4.3)
|
||||
mini_portile (0.6.0)
|
||||
multi_json (1.10.1)
|
||||
net-scp (1.1.2)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-sftp (2.1.2)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh (2.9.2)
|
||||
netrc (0.10.2)
|
||||
net-ssh (2.9.1)
|
||||
nokogiri (1.6.3.1)
|
||||
mini_portile (= 0.6.0)
|
||||
nori (1.1.5)
|
||||
rack (1.6.0)
|
||||
rake (10.4.2)
|
||||
rack (1.5.2)
|
||||
rake (10.3.2)
|
||||
rb-fsevent (0.9.4)
|
||||
rb-inotify (0.9.5)
|
||||
ffi (>= 0.5.0)
|
||||
rb-kqueue (0.2.3)
|
||||
ffi (>= 0.5.0)
|
||||
rest-client (1.7.2)
|
||||
mime-types (>= 1.16, < 3.0)
|
||||
netrc (~> 0.7)
|
||||
rubyntlm (0.1.1)
|
||||
savon (0.9.5)
|
||||
akami (~> 1.0)
|
||||
|
|
@ -125,6 +117,3 @@ DEPENDENCIES
|
|||
vagrant-lxc!
|
||||
vagrant-omnibus
|
||||
vagrant-pristine!
|
||||
|
||||
BUNDLED WITH
|
||||
1.10.4
|
||||
|
|
|
|||
14
README.md
14
README.md
|
|
@ -1,19 +1,14 @@
|
|||
🟢 We plan to support and maintain vagrant-lxc, as well as clean it up.<br/>
|
||||
🟢 Please feel free to contribute Issues and pull requests.<br/>
|
||||
🟢 P.S: Thanks [Fabio Rehm](https://fabiorehm.com) for the amazing initial project.
|
||||
|
||||
--------
|
||||
|
||||
# vagrant-cachier
|
||||
|
||||
[](http://badge.fury.io/rb/vagrant-cachier) [](https://gitter.im/fgrehm/vagrant-cachier)
|
||||
[](http://badge.fury.io/rb/vagrant-cachier) [](https://www.gittip.com/fgrehm/) [](https://gitter.im/fgrehm/vagrant-cachier)
|
||||
|
||||
A [Vagrant](http://www.vagrantup.com/) plugin that helps you reduce the amount of
|
||||
coffee you drink while waiting for boxes to be provisioned by sharing a common
|
||||
package cache among similar VM instances. Kinda like [vagrant-apt_cache](https://github.com/avit/vagrant-apt_cache)
|
||||
or [this magical snippet](http://gist.github.com/juanje/3797297) but targeting
|
||||
package cache among similiar VM instances. Kinda like [vagrant-apt_cache](https://github.com/avit/vagrant-apt_cache)
|
||||
or [this magical snippet](http://gist.github.com/juanje/3797297) but targetting
|
||||
multiple package managers and Linux distros.
|
||||
|
||||
|
||||
## Installation
|
||||
|
||||
Make sure you have Vagrant 1.4+ and run:
|
||||
|
|
@ -58,7 +53,6 @@ http://fgrehm.viewdocs.io/vagrant-cachier.
|
|||
* [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc)
|
||||
* [VMware providers](http://www.vagrantup.com/vmware) with NFS enabled (See
|
||||
[GH-24](https://github.com/fgrehm/vagrant-cachier/issues/24) for more info)
|
||||
* [vagrant-parallels](https://github.com/Parallels/vagrant-parallels)
|
||||
* [vagrant-libvirt](https://github.com/pradels/vagrant-libvirt)
|
||||
* [vagrant-kvm](https://github.com/adrahon/vagrant-kvm)
|
||||
* _[Let us know if it is compatible with other providers!](https://github.com/fgrehm/vagrant-cachier/issues/new)_
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
# Chef RubyGems
|
||||
|
||||
When a Chef installation is detected, this bucket caches its embedded gems.
|
||||
Most of these gems are part of the Chef omnibus package but sometimes cookbooks
|
||||
need to install extra gems to run within the context of a Chef recipe using the
|
||||
`chef_gem` resource.
|
||||
|
||||
The embedded Chef gem location is returned by running the
|
||||
`/opt/chef/embedded/bin/gem env gemdir` command.
|
||||
|
||||
To manually enable it:
|
||||
|
||||
```ruby
|
||||
Vagrant.configure("2") do |config|
|
||||
config.vm.box = 'some-box-using-chef-provisioner'
|
||||
config.cache.enable :chef_gem
|
||||
end
|
||||
```
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
# DNF
|
||||
|
||||
Used by Fedora guests, will get configured under guest's `/var/cache/dnf`. It will
|
||||
also [make sure](lib/vagrant-cachier/bucket/dnf.rb#L20) that `keepcache` is set to
|
||||
`1` on guest's `/etc/dnf/dnf.conf`.
|
||||
|
||||
To manually enable it:
|
||||
|
||||
```ruby
|
||||
Vagrant.configure("2") do |config|
|
||||
config.vm.box = 'some-fedora-box'
|
||||
config.cache.enable :dnf
|
||||
end
|
||||
```
|
||||
|
||||
### :warning: Notice about Windows hosts :warning:
|
||||
|
||||
In case this bucket is enabled and a Windows host is in use, you might see an
|
||||
ugly stacktrace as described on [this comment](https://github.com/fgrehm/vagrant-cachier/issues/117#issuecomment-50548393)
|
||||
if some DNF repository is not available during provisioning.
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
# [pip](https://pip.pypa.io/)
|
||||
|
||||
Compatible with probably any type of linux guest distro, will hook into pip's
|
||||
http and wheels cache directory under `$HOME/.cache/pip/http` and `$HOME/.cache/pip/wheels` as
|
||||
the default SSH user (usually `vagrant`) on your guest.
|
||||
|
||||
To manually enable it:
|
||||
|
||||
```ruby
|
||||
Vagrant.configure("2") do |config|
|
||||
config.vm.box = 'some-box-with-pip-installed'
|
||||
config.cache.enable :pip
|
||||
end
|
||||
```
|
||||
|
||||
|
|
@ -87,9 +87,7 @@
|
|||
<li><a tabindex="-1" href="buckets/apt-lists">apt-lists</a></li>
|
||||
<li><a tabindex="-1" href="buckets/apt-cacher">apt-cacher</a></li>
|
||||
<li><a tabindex="-1" href="buckets/chef">Chef</a></li>
|
||||
<li><a tabindex="-1" href="buckets/chef_rubygems">Chef Gems</a></li>
|
||||
<li><a tabindex="-1" href="buckets/composer">Composer</a></li>
|
||||
<li><a tabindex="-1" href="buckets/dnf">DNF</a></li>
|
||||
<li><a tabindex="-1" href="buckets/bower">Bower</a></li>
|
||||
<li><a tabindex="-1" href="buckets/pacman">Pacman</a></li>
|
||||
<li><a tabindex="-1" href="buckets/npm">npm</a></li>
|
||||
|
|
@ -97,7 +95,6 @@
|
|||
<li><a tabindex="-1" href="buckets/rvm">rvm</a></li>
|
||||
<li><a tabindex="-1" href="buckets/yum">Yum</a></li>
|
||||
<li><a tabindex="-1" href="buckets/zypper">Zypper</a></li>
|
||||
<li><a tabindex="-1" href="buckets/pip">pip</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
|
|
|
|||
|
|
@ -90,10 +90,8 @@ end
|
|||
require_relative "bucket/apt"
|
||||
require_relative "bucket/chef"
|
||||
require_relative "bucket/gem"
|
||||
require_relative "bucket/chef_gem"
|
||||
require_relative "bucket/pacman"
|
||||
require_relative "bucket/yum"
|
||||
require_relative "bucket/dnf"
|
||||
require_relative "bucket/rvm"
|
||||
require_relative "bucket/apt_cacher"
|
||||
require_relative "bucket/apt_lists"
|
||||
|
|
@ -102,4 +100,3 @@ require_relative "bucket/bower"
|
|||
require_relative "bucket/npm"
|
||||
require_relative "bucket/zypper"
|
||||
require_relative "bucket/generic"
|
||||
require_relative "bucket/pip"
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
module VagrantPlugins
|
||||
module Cachier
|
||||
class Bucket
|
||||
class ChefGem < Bucket
|
||||
def self.capability
|
||||
:chef_gemdir
|
||||
end
|
||||
|
||||
def install
|
||||
if guest.capability?(:chef_gemdir)
|
||||
if gemdir_path = guest.capability(:chef_gemdir)
|
||||
prefix = gemdir_path.split('/').last
|
||||
bucket_path = "/tmp/vagrant-cache/#{@name}/#{prefix}"
|
||||
gem_cache_path = "#{gemdir_path}/cache"
|
||||
|
||||
symlink(gem_cache_path, bucket_path)
|
||||
end
|
||||
else
|
||||
@env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'ChefRubyGems')
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
module VagrantPlugins
|
||||
module Cachier
|
||||
class Bucket
|
||||
class Dnf < Bucket
|
||||
def self.capability
|
||||
:dnf_cache_dir
|
||||
end
|
||||
|
||||
def install
|
||||
if guest.capability?(:dnf_cache_dir)
|
||||
if guest_path = guest.capability(:dnf_cache_dir)
|
||||
return if @env[:cache_dirs].include?(guest_path)
|
||||
|
||||
# Ensure caching is enabled
|
||||
comm.sudo("sed -i '/keepcache=/d' /etc/dnf/dnf.conf")
|
||||
comm.sudo("sed -i '/^[main]/a keepcache=1' /etc/dnf/dnf.conf")
|
||||
|
||||
symlink(guest_path)
|
||||
end
|
||||
else
|
||||
@env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'DNF')
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
module VagrantPlugins
|
||||
module Cachier
|
||||
class Bucket
|
||||
class Pip < Bucket
|
||||
def self.capability
|
||||
:pip_cache_dir
|
||||
end
|
||||
|
||||
def install
|
||||
if guest.capability?(:pip_cache_dir)
|
||||
if guest_path = guest.capability(:pip_cache_dir)
|
||||
symlink("#{guest_path}/http", "/tmp/vagrant-cache/#{@name}/http")
|
||||
symlink("#{guest_path}/wheels", "/tmp/vagrant-cache/#{@name}/wheels")
|
||||
end
|
||||
else
|
||||
@env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'pip')
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -8,14 +8,13 @@ module VagrantPlugins
|
|||
|
||||
def install
|
||||
if guest.capability?(:yum_cache_dir)
|
||||
if guest_path = guest.capability(:yum_cache_dir)
|
||||
return if @env[:cache_dirs].include?(guest_path)
|
||||
guest_path = guest.capability(:yum_cache_dir)
|
||||
return if @env[:cache_dirs].include?(guest_path)
|
||||
|
||||
# Ensure caching is enabled
|
||||
comm.sudo("sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf")
|
||||
# Ensure caching is enabled
|
||||
comm.sudo("sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf")
|
||||
|
||||
symlink(guest_path)
|
||||
end
|
||||
symlink(guest_path)
|
||||
else
|
||||
@env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Yum')
|
||||
end
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ module VagrantPlugins
|
|||
module ChefFileCachePath
|
||||
def self.chef_provisioner?(machine)
|
||||
provisioners = machine.config.vm.provisioners
|
||||
chef_provisioners = [:chef_solo, :chef_client, :chef_zero]
|
||||
compat_provisioners = provisioners.select { |p| chef_provisioners.include? p.name || p.type }
|
||||
chef_provisioners = [:chef_solo, :chef_client]
|
||||
compat_provisioners = provisioners.keep_if { |p| chef_provisioners.include? p.name }
|
||||
|
||||
if compat_provisioners.size > 1
|
||||
raise "One machine is using multiple chef provisioners, which is unsupported."
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
module VagrantPlugins
|
||||
module Cachier
|
||||
module Cap
|
||||
module Linux
|
||||
module ChefGemdir
|
||||
def self.chef_gemdir(machine)
|
||||
gemdir = nil
|
||||
machine.communicate.tap do |comm|
|
||||
return unless comm.test('test -f /opt/chef/embedded/bin/gem')
|
||||
comm.execute '/opt/chef/embedded/bin/gem env gemdir' do |buffer, output|
|
||||
gemdir = output.chomp if buffer == :stdout
|
||||
end
|
||||
end
|
||||
return gemdir
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
module VagrantPlugins
|
||||
module Cachier
|
||||
module Cap
|
||||
module Linux
|
||||
module PipCacheDir
|
||||
def self.pip_cache_dir(machine)
|
||||
pip_cache_dir = nil
|
||||
machine.communicate.tap do |comm|
|
||||
return unless comm.test('which pip')
|
||||
comm.execute 'echo $HOME' do |buffer, output|
|
||||
pip_cache_dir = output.chomp if buffer == :stdout
|
||||
end
|
||||
end
|
||||
return "#{pip_cache_dir}/.cache/pip"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
module VagrantPlugins
|
||||
module Cachier
|
||||
module Cap
|
||||
module RedHat
|
||||
module DnfCacheDir
|
||||
def self.dnf_cache_dir(machine)
|
||||
dnf_cache_dir = nil
|
||||
machine.communicate.tap do |comm|
|
||||
return unless comm.test('which dnf')
|
||||
dnf_cache_dir = '/var/cache/dnf'
|
||||
end
|
||||
return dnf_cache_dir
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -4,13 +4,7 @@ module VagrantPlugins
|
|||
module RedHat
|
||||
module YumCacheDir
|
||||
def self.yum_cache_dir(machine)
|
||||
yum_cache_dir = nil
|
||||
machine.communicate.tap do |comm|
|
||||
# In case yum is only forwarding to dnf do not cache
|
||||
return unless not comm.test('yum --version 2>&1 | grep /usr/bin/dnf')
|
||||
yum_cache_dir = '/var/cache/yum'
|
||||
end
|
||||
return yum_cache_dir
|
||||
'/var/cache/yum'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -6,11 +6,6 @@ module VagrantPlugins
|
|||
Cap::Linux::Gemdir
|
||||
end
|
||||
|
||||
guest_capability 'linux', 'chef_gemdir' do
|
||||
require_relative 'cap/linux/chef_gemdir'
|
||||
Cap::Linux::ChefGemdir
|
||||
end
|
||||
|
||||
guest_capability 'linux', 'rvm_path' do
|
||||
require_relative 'cap/linux/rvm_path'
|
||||
Cap::Linux::RvmPath
|
||||
|
|
@ -36,11 +31,6 @@ module VagrantPlugins
|
|||
Cap::Linux::NpmCacheDir
|
||||
end
|
||||
|
||||
guest_capability 'linux', 'pip_cache_dir' do
|
||||
require_relative 'cap/linux/pip_cache_dir'
|
||||
Cap::Linux::PipCacheDir
|
||||
end
|
||||
|
||||
guest_capability 'debian', 'apt_cache_dir' do
|
||||
require_relative 'cap/debian/apt_cache_dir'
|
||||
Cap::Debian::AptCacheDir
|
||||
|
|
@ -61,11 +51,6 @@ module VagrantPlugins
|
|||
Cap::RedHat::YumCacheDir
|
||||
end
|
||||
|
||||
guest_capability 'redhat', 'dnf_cache_dir' do
|
||||
require_relative 'cap/redhat/dnf_cache_dir'
|
||||
Cap::RedHat::DnfCacheDir
|
||||
end
|
||||
|
||||
guest_capability 'suse', 'yum_cache_dir' do
|
||||
# Disable Yum on suse guests
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
module VagrantPlugins
|
||||
module Cachier
|
||||
VERSION = "1.2.1"
|
||||
VERSION = "1.1.0"
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue