Merge pull request #31 from jdeathe/develop

Release changes for 1.2.0

CentOS-7-Minimal-Cloud-Init-virtualbox.json

@@ -3,9 +3,9 @@
     "build_export_format": "ovf",
     "build_iso_checksum": "71a7aa147877b413497cdff5b1e0aa5bc0c9484f",
     "build_iso_checksum_type": "sha1",
-    "build_iso_filename": "CentOS-7-x86_64-Minimal-1611.iso",
+    "build_iso_filename": "CentOS-7-x86_64-Minimal-1708.iso",
     "build_iso_target_path": "isos/x86_64",
-    "build_name": "CentOS-7.3.1611-x86_64-Minimal-Cloud-Init-en_US",
+    "build_name": "CentOS-7.4.1708-x86_64-Minimal-Cloud-Init-en_US",
     "build_output_directory": "builds",
     "guest_boot_timeout": "0",
     "guest_bootloader_append": "net.ifnames=0 biosdevname=0",
@@ -18,7 +18,7 @@
     "guest_lv_root_mkfsoptions": "-i 4096",
     "guest_lv_root_size": "1024",
     "guest_lv_swap_size": "4096",
-    "guest_name": "CentOS-7.3.1611-x86_64-Minimal-Cloud-Init-en_US",
+    "guest_name": "CentOS-7.4.1708-x86_64-Minimal-Cloud-Init-en_US",
     "guest_partition_boot_fstype": "ext4",
     "guest_partition_boot_size": "250",
     "guest_memory": "512",
@@ -142,9 +142,9 @@
       "execute_command": "chmod +x \"{{.Script}}\"; {{.Vars}} /bin/bash \"{{.Script}}\" {{user `vagrantfile_template`}}",
       "inline_shebang": "/bin/bash -e",
       "inline": [
-        "if [[ -n ${1} ]] && [[ -f ${1} ]]; then",
+        "if [[ -n ${1} ]] && [[ -f output-tmp/${1} ]]; then",
         "  echo '--> Restoring Vagrantfile template.'",
-        "  mv -f ${1} .",
+        "  mv -f output-tmp/${1} ${1}",
         "fi",
         "echo '--> Cleanup output directories.'",
         "find . -mindepth 1 -maxdepth 1 -type d -name \"output-*\" -exec rm -rf '{}' +"

CentOS-7-Minimal-virtualbox.json

@@ -3,9 +3,9 @@
     "build_export_format": "ovf",
     "build_iso_checksum": "71a7aa147877b413497cdff5b1e0aa5bc0c9484f",
     "build_iso_checksum_type": "sha1",
-    "build_iso_filename": "CentOS-7-x86_64-Minimal-1611.iso",
+    "build_iso_filename": "CentOS-7-x86_64-Minimal-1708.iso",
     "build_iso_target_path": "isos/x86_64",
-    "build_name": "CentOS-7.3.1611-x86_64-Minimal-en_US",
+    "build_name": "CentOS-7.4.1708-x86_64-Minimal-en_US",
     "build_output_directory": "builds",
     "guest_boot_timeout": "0",
     "guest_bootloader_append": "net.ifnames=0 biosdevname=0",
@@ -18,7 +18,7 @@
     "guest_lv_root_mkfsoptions": "-i 4096",
     "guest_lv_root_size": "1024",
     "guest_lv_swap_size": "4096",
-    "guest_name": "CentOS-7.3.1611-x86_64-Minimal-en_US",
+    "guest_name": "CentOS-7.4.1708-x86_64-Minimal-en_US",
     "guest_partition_boot_fstype": "ext4",
     "guest_partition_boot_size": "1024",
     "guest_memory": "512",
@@ -142,9 +142,9 @@
       "execute_command": "chmod +x \"{{.Script}}\"; {{.Vars}} /bin/bash \"{{.Script}}\" {{user `vagrantfile_template`}}",
       "inline_shebang": "/bin/bash -e",
       "inline": [
-        "if [[ -n ${1} ]] && [[ -f ${1} ]]; then",
+        "if [[ -n ${1} ]] && [[ -f output-tmp/${1} ]]; then",
         "  echo '--> Restoring Vagrantfile template.'",
-        "  mv -f ${1} .",
+        "  mv -f output-tmp/${1} ${1}",
         "fi",
         "echo '--> Cleanup output directories.'",
         "find . -mindepth 1 -maxdepth 1 -type d -name \"output-*\" -exec rm -rf '{}' +"

CentOS-7.4.1708-x86_64-Minimal-Cloud-Init-en_US.json

@@ -0,0 +1,16 @@
+{
+  "build_iso_checksum": "aae20c8052a55cf179af88d9dd35f1a889cd5773",
+  "build_iso_checksum_type": "sha1",
+  "build_iso_filename": "CentOS-7-x86_64-Minimal-1708.iso",
+  "build_iso_target_path": "isos/x86_64",
+  "build_name": "CentOS-7.4.1708-x86_64-Minimal-Cloud-Init-en_US",
+  "guest_hard_disk_size": "40960",
+  "guest_keyboard": "us",
+  "guest_language": "en_US.UTF-8",
+  "guest_lv_swap_size": "4096",
+  "guest_name": "CentOS-7.4.1708-x86_64-Minimal-Cloud-Init-en_US",
+  "guest_partition_boot_size": "1024",
+  "guest_memory": "512",
+  "guest_selinux": "permissive",
+  "guest_vg_root_reserved_space": "0"
+}

CentOS-7.4.1708-x86_64-Minimal-en_US.json

@@ -0,0 +1,16 @@
+{
+  "build_iso_checksum": "aae20c8052a55cf179af88d9dd35f1a889cd5773",
+  "build_iso_checksum_type": "sha1",
+  "build_iso_filename": "CentOS-7-x86_64-Minimal-1708.iso",
+  "build_iso_target_path": "isos/x86_64",
+  "build_name": "CentOS-7.4.1708-x86_64-Minimal-en_US",
+  "guest_hard_disk_size": "40960",
+  "guest_keyboard": "us",
+  "guest_language": "en_US.UTF-8",
+  "guest_lv_swap_size": "4096",
+  "guest_name": "CentOS-7.4.1708-x86_64-Minimal-en_US",
+  "guest_partition_boot_size": "1024",
+  "guest_memory": "512",
+  "guest_selinux": "permissive",
+  "guest_vg_root_reserved_space": "0"
+}

Makefile

@@ -33,7 +33,7 @@ Variables (default value):
                               - Minimal
                               - Minimal-Cloud-Init
   - BOX_VERSION_RELEASE     The CentOS-7 Minor Release number. Note: A
-    (7.3.1611)              corresponding template is required.
+    (7.4.1708)              corresponding template is required.
 
 endef
 
@@ -46,7 +46,7 @@ BOX_DEBUG ?= false
 BOX_LANG ?= en_US
 BOX_OUTPUT_PATH ?= ./builds
 BOX_VARIANT ?= Minimal
-BOX_VERSION_RELEASE ?= 7.3.1611
+BOX_VERSION_RELEASE ?= 7.4.1708
 
 # UI constants
 COLOUR_NEGATIVE := \033[1;31m

README.md

@@ -2,7 +2,7 @@
 
 This provides the configuration and Makefile to build a [Vagrant](https://www.vagrantup.com) minimal base box using [Packer](https://www.packer.io). The base box is intended for server (terminal) use only so is restricted to a single locale (with `en_US` being the default) which allows for a smaller box size.
 
-There are templates provided for `CentOS-7.2.1511` and `CentOS-7.3.1611` with `x86_64` architecture. There is currently no requirement to support older minor release versions or alternative architectures but they could be added if necessary.
+There are templates provided for `CentOS-7.2.1511`, `CentOS-7.3.1611`, and `CentOS-7.4.1708` with `x86_64` architecture. There is currently no requirement to support older minor release versions or alternative architectures but they could be added if necessary.
 
 ## Usage Instructions
 
@@ -12,13 +12,13 @@ The build environment required is Mac OSX or GNU Linux.
 
 To build the box file you will need the following installed:
 
-- [VirtualBox](https://www.virtualbox.org) (5.1.22)
-- [Vagrant](https://www.vagrantup.com) (1.9.5)
-- [Packer](https://www.packer.io) (1.0.0)
+- [VirtualBox](https://www.virtualbox.org) (5.1.28)
+- [Vagrant](https://www.vagrantup.com) (2.0.0)
+- [Packer](https://www.packer.io) (1.1.0)
 
 ### Build
 
-To build the latest `7.3.1611`, `x86_64` base box run `make` or `make build`.
+To build the latest `7.4.1708`, `x86_64` base box run `make` or `make build`.
 
 ```
 $ make