boxes 2.0.2 → 2.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/.ruby-version +1 -1
  3. data/CHANGELOG.md +12 -0
  4. data/lib/boxes/version.rb +1 -1
  5. data/scripts/ruby.sh +4 -4
  6. data/scripts/vmtools.sh +8 -1
  7. data/templates/debian/jessie64.erb +60 -0
  8. data/templates/debian/preseed.cfg +1 -0
  9. data/templates/debian/wheezy64.erb +1 -1
  10. data/templates/ubuntu/vivid64.erb +61 -0
  11. data/templates/ubuntu/wily64.erb +64 -0
  12. metadata +6 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 770490ef960a34e01bb3d8f96c6a7955a9560e66
4
- data.tar.gz: 02b6e1b2ac15aed50018809105837780877f9dac
3
+ metadata.gz: 7f62b92eb5b4abe82721f0f2abc51a4efc37e026
4
+ data.tar.gz: fd58830f5bde4d3c02cc2f9221f75afe361ed051
5
5
  SHA512:
6
- metadata.gz: 856fa3360e4743392f4bd15ab310ab7e2aba082d64a2dfaa667f6bde49f9285c99a10b9d5dc8934dce2add95a5a3b49e4f7eea5c0a7f49d869368910aae69fab
7
- data.tar.gz: ccf460ff64e4621cdef3caff21a77303510378b322150be01e98ada727d24c333450fe669eadd3de36f8196bfb85bfc0b97dd341063e6b69cc3325d200794d1b
6
+ metadata.gz: d0323cf030050d4e5fa842b5b59194e7a5bf48f244937ae433d5382ed9bdb5066e761e3fb26f62433f8e8080923407e4d02ac2b4b3dc329828cf72fc4701f74e
7
+ data.tar.gz: 41255626c0fd529a280037352b05cc8e2973ee668d20358e12514e8fe5a66cd5b40fab4b8576a89490167488283a53041ae68775ceac6de3fda18788137f2e78
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- ruby-2.2.2
1
+ ruby-2.3.0
data/CHANGELOG.md CHANGED
@@ -1,5 +1,16 @@
1
1
  # CHANGELOG
2
2
 
3
+ ## 2.1.0 (15/02/2015)
4
+
5
+ * Adds support for Debian Jessie (@kirjatoukka).
6
+ * Adds support for Ubuntu Vivid (15.04) and Wily (15.10).
7
+ * Updates the Debian Wheezy URL to a valid mirror ([24][]).
8
+ * Reverts the switch to `open-vm-tools`, which was breaking certain kernel
9
+ support.
10
+ * Updates the version of `ruby-install` used in `scripts/ruby.sh`.
11
+ * Removes Ruby 2.1.5, 2.2.0 and 2.2.1.
12
+ * Adds Ruby 2.2.3, 2.2.3 and 2.3.0.
13
+
3
14
  ## 2.0.2 (08/11/2015)
4
15
 
5
16
  * Switches to `open-vm-tools` for VMWare ([20][]).
@@ -21,4 +32,5 @@
21
32
  * Allows the building of all of the previous styles of boxes.
22
33
 
23
34
  [20]: https://github.com/nickcharlton/boxes/issues/20
35
+ [24]: https://github.com/nickcharlton/boxes/issues/24
24
36
  [25]: https://github.com/nickcharlton/boxes/issues/25
data/lib/boxes/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # Versions and other declarations.
2
2
  module Boxes
3
- VERSION = '2.0.2'
3
+ VERSION = '2.1.0'
4
4
  end
data/scripts/ruby.sh CHANGED
@@ -4,7 +4,7 @@
4
4
  # the 'ruby' special box type.
5
5
 
6
6
  chruby_version=0.3.9
7
- rubyinstall_version=0.5.0
7
+ rubyinstall_version=0.6.0
8
8
 
9
9
  # install chruby
10
10
  wget -O chruby-$chruby_version.tar.gz https://github.com/postmodern/chruby/archive/v$chruby_version.tar.gz
@@ -27,10 +27,10 @@ cd ruby-install-$rubyinstall_version/
27
27
  make install
28
28
 
29
29
  # install a set of recent MRI Rubies.
30
- ruby-install ruby 2.1.5
31
- ruby-install ruby 2.2.0
32
- ruby-install ruby 2.2.1
33
30
  ruby-install ruby 2.2.2
31
+ ruby-install ruby 2.2.3
32
+ ruby-install ruby 2.2.4
33
+ ruby-install ruby 2.3.0
34
34
 
35
35
  # update gems and install bundler
36
36
  source /usr/local/share/chruby/chruby.sh
data/scripts/vmtools.sh CHANGED
@@ -16,8 +16,15 @@ case $PACKER_BUILDER_TYPE in
16
16
  ;;
17
17
  'vmware-iso')
18
18
  echo "Installing VMware Tools..."
19
+ mkdir -p /mnt/cdrom
20
+ mount -o loop /home/vagrant/linux.iso /mnt/cdrom
19
21
 
20
- apt-get -qy install open-vm-tools
22
+ cd /tmp
23
+ tar -zxpf /mnt/cdrom/VMwareTools-*.tar.gz -C /tmp/
24
+ /tmp/vmware-tools-distrib/vmware-install.pl --force-install --default
25
+
26
+ umount /mnt/cdrom
27
+ rm -f /home/vagrant/linux.iso
21
28
  ;;
22
29
  *)
23
30
  printf "Nothing to do for the %s builder type.\n" $PACKER_BUILDER_TYPE
data/templates/debian/jessie64.erb ADDED
@@ -0,0 +1,60 @@
1
+ {
2
+ "provisioners": [
3
+ {
4
+ "type": "shell",
5
+ "scripts": [
6
+ "scripts/postinstall.sh",
7
+ "scripts/vmtools.sh",
8
+ <%- @scripts.each do |script| -%>
9
+ "scripts/<%= script %>",
10
+ <%- end -%>
11
+ "scripts/purge.sh"
12
+ ],
13
+ "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -E -S bash '{{ .Path }}'"
14
+ }
15
+ ],
16
+ "builders": [
17
+ {
18
+ "name": "<%= @name %>",
19
+ "type": "<%= @provider %>-iso",
20
+ <%- if @provider == "vmware" -%>
21
+ "guest_os_type": "debian7-64",
22
+ "tools_upload_flavor": "linux",
23
+ <%- else -%>
24
+ "guest_os_type": "Debian_64",
25
+ <%- end -%>
26
+ "headless": true,
27
+
28
+ "iso_url": "http://cdimage.debian.org/debian-cd/8.2.0/amd64/iso-cd/debian-8.2.0-amd64-netinst.iso",
29
+ "iso_checksum": "d393d17ac6b3113c81186e545c416a00f28ed6e05774284bb5e8f0df39fcbcb9",
30
+ "iso_checksum_type": "sha256",
31
+
32
+ "ssh_username": "vagrant",
33
+ "ssh_password": "vagrant",
34
+ "ssh_timeout": "15m",
35
+
36
+ "http_directory": "templates/debian",
37
+
38
+ "boot_command": [
39
+ "<esc><wait>",
40
+ "install ",
41
+ "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg ",
42
+ "debian-installer=en_US auto=true locale=en_US kbd-chooser/method=us ",
43
+ "netcfg/get_hostname={{ .Name }} ",
44
+ "netcfg/get_domain=vagrantup.com ",
45
+ "fb=false debconf/frontend=noninteractive ",
46
+ "console-setup/ask_detect=false console-keymaps-at/keymap=us ",
47
+ "keyboard-configuration/xkb-keymap=us ",
48
+ "<enter>"
49
+ ],
50
+
51
+ "shutdown_command": "echo 'shutdown -h now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'"
52
+ }
53
+ ],
54
+
55
+ "post-processors": [
56
+ {
57
+ "type": "vagrant"
58
+ }
59
+ ]
60
+ }
data/templates/debian/preseed.cfg CHANGED
@@ -56,6 +56,7 @@ d-i popularity-contest/participate boolean false
56
56
  postfix postfix/main_mailer_type select No configuration
57
57
 
58
58
  # boot loader
59
+ d-i grub-installer/bootdev string default
59
60
  d-i grub-installer/only_debian boolean true
60
61
 
61
62
  # hide the shutdown notice
data/templates/debian/wheezy64.erb CHANGED
@@ -25,7 +25,7 @@
25
25
  <%- end -%>
26
26
  "headless": true,
27
27
 
28
- "iso_url": "http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-7.8.0-amd64-netinst.iso",
28
+ "iso_url": "http://debian.ethz.ch/debian-cd/7.8.0/amd64/iso-cd/debian-7.8.0-amd64-netinst.iso",
29
29
  "iso_checksum": "e39c36d6adc0fd86c6edb0e03e22919086c883b37ca194d063b8e3e8f6ff6a3a",
30
30
  "iso_checksum_type": "sha256",
31
31
 
data/templates/ubuntu/vivid64.erb ADDED
@@ -0,0 +1,61 @@
1
+ {
2
+ "provisioners": [
3
+ {
4
+ "type": "shell",
5
+ "scripts": [
6
+ "scripts/postinstall.sh",
7
+ "scripts/vmtools.sh",
8
+ <%- @scripts.each do |script| -%>
9
+ "scripts/<%= script %>",
10
+ <%- end -%>
11
+ "scripts/purge.sh"
12
+ ],
13
+ "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -E -S bash '{{ .Path }}'"
14
+ }
15
+ ],
16
+
17
+ "builders": [
18
+ {
19
+ "name": "<%= @name %>",
20
+ "type": "<%= @provider %>-iso",
21
+ <%- if @provider == "vmware" -%>
22
+ "guest_os_type": "ubuntu-64",
23
+ "tools_upload_flavor": "linux",
24
+ <%- else -%>
25
+ "guest_os_type": "Ubuntu_64",
26
+ <%- end -%>
27
+ "headless": true,
28
+
29
+ "iso_url": "http://releases.ubuntu.com/vivid/ubuntu-15.04-server-amd64.iso",
30
+ "iso_checksum": "6501c8545374665823384bbb6235f865108f56d8a30bbf69dd18df73c14ccb84",
31
+ "iso_checksum_type": "sha256",
32
+
33
+ "ssh_username": "vagrant",
34
+ "ssh_password": "vagrant",
35
+ "ssh_timeout": "15m",
36
+
37
+ "http_directory": "templates/ubuntu",
38
+
39
+ "boot_command": [
40
+ "<esc><esc><enter><wait>",
41
+ "/install/vmlinuz noapic ",
42
+ "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg ",
43
+ "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ",
44
+ "hostname={{ .Name }} ",
45
+ "fb=false debconf/frontend=noninteractive ",
46
+ "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ",
47
+ "keyboard-configuration/variant=USA console-setup/ask_detect=false ",
48
+ "grub-installer/bootdev=/dev/sda ",
49
+ "initrd=/install/initrd.gz -- <enter>"
50
+ ],
51
+
52
+ "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'"
53
+ }
54
+ ],
55
+
56
+ "post-processors": [
57
+ {
58
+ "type": "vagrant"
59
+ }
60
+ ]
61
+ }
data/templates/ubuntu/wily64.erb ADDED
@@ -0,0 +1,64 @@
1
+ {
2
+ "provisioners": [
3
+ {
4
+ "type": "shell",
5
+ "scripts": [
6
+ "scripts/postinstall.sh",
7
+ "scripts/vmtools.sh",
8
+ <%- @scripts.each do |script| -%>
9
+ "scripts/<%= script %>",
10
+ <%- end -%>
11
+ "scripts/purge.sh"
12
+ ],
13
+ "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -E -S bash '{{ .Path }}'"
14
+ }
15
+ ],
16
+
17
+ "builders": [
18
+ {
19
+ "name": "<%= @name %>",
20
+ "type": "<%= @provider %>-iso",
21
+ <%- if @provider == "vmware" -%>
22
+ "guest_os_type": "ubuntu-64",
23
+ "tools_upload_flavor": "linux",
24
+ <%- else -%>
25
+ "guest_os_type": "Ubuntu_64",
26
+ <%- end -%>
27
+ "headless": true,
28
+
29
+ "iso_url": "http://releases.ubuntu.com/wily/ubuntu-15.10-server-amd64.iso",
30
+ "iso_checksum": "86aa35a986eba6e5ad30e3d486d57efe6803ae7ea4859b0216953e9e62871131",
31
+ "iso_checksum_type": "sha256",
32
+
33
+ "ssh_username": "vagrant",
34
+ "ssh_password": "vagrant",
35
+ "ssh_timeout": "15m",
36
+
37
+ "http_directory": "templates/ubuntu",
38
+
39
+ "boot_command": [
40
+ "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
41
+ "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
42
+ "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
43
+ "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
44
+ "/install/vmlinuz noapic ",
45
+ "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg ",
46
+ "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ",
47
+ "hostname={{ .Name }} ",
48
+ "fb=false debconf/frontend=noninteractive ",
49
+ "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ",
50
+ "keyboard-configuration/variant=USA console-setup/ask_detect=false ",
51
+ "grub-installer/bootdev=/dev/sda ",
52
+ "initrd=/install/initrd.gz -- <enter>"
53
+ ],
54
+
55
+ "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'"
56
+ }
57
+ ],
58
+
59
+ "post-processors": [
60
+ {
61
+ "type": "vagrant"
62
+ }
63
+ ]
64
+ }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: boxes
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.2
4
+ version: 2.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nick Charlton
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-11-08 00:00:00.000000000 Z
11
+ date: 2016-02-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: claide
@@ -188,11 +188,14 @@ files:
188
188
  - spec/boxes/template_spec.rb
189
189
  - spec/spec_helper.rb
190
190
  - spec/support/subprocess_command.rb
191
+ - templates/debian/jessie64.erb
191
192
  - templates/debian/preseed.cfg
192
193
  - templates/debian/wheezy64.erb
193
194
  - templates/ubuntu/precise64.erb
194
195
  - templates/ubuntu/preseed.cfg
195
196
  - templates/ubuntu/trusty64.erb
197
+ - templates/ubuntu/vivid64.erb
198
+ - templates/ubuntu/wily64.erb
196
199
  homepage: https://github.com/nickcharlton/boxes
197
200
  licenses:
198
201
  - MIT
@@ -213,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
213
216
  version: '0'
214
217
  requirements: []
215
218
  rubyforge_project:
216
- rubygems_version: 2.4.5
219
+ rubygems_version: 2.5.1
217
220
  signing_key:
218
221
  specification_version: 4
219
222
  summary: A command line tool to take the complexity out of building Vagrant boxes.