2.2.3 - Read Changelog

Author: LevonBecker

.dockerignore

@@ -9,9 +9,9 @@ bin/*
 .bundle/*
 .kitchen
 .kitchen.local.yml
-Berksfile.lock
+#Berksfile.lock
 test/data_bags/bonusbits_mediawiki_nginx/bonusbits_prd_decrypted.json
-Gemfile.lock
+#Gemfile.lock
 vendor/*
 # Mac OS
 .DS_Store

.gitignore

@@ -20,8 +20,8 @@ pkg/
 
 # Berkshelf
 /cookbooks
-Berksfile.lock
-Gemfile.lock
+#Berksfile.lock
+#Gemfile.lock
 
 # Bundler
 bin/*

.kitchen.yml

@@ -35,8 +35,8 @@ platforms:
         ssl_verify_mode: ":verify_none"
     provisioner:
       name: chef_zero
-      require_chef_omnibus: 12.19.36
-      always_update_cookbooks: true
+      require_chef_omnibus: 12.21.4
+      # always_update_cookbooks: true
       data_bags_path: test/data_bags
       encrypted_data_bag_secret_key_path: test/data_bags/encrypted_data_bag_secret
       roles_path: test/roles
@@ -121,8 +121,8 @@ suites:
   - name: ec2_base
     provisioner:
       name: chef_zero
-      always_update_cookbooks: true
-      require_chef_omnibus: 12.19.36
+      # always_update_cookbooks: true
+      require_chef_omnibus: 12.21.4
       data_bags_path: test/data_bags
       encrypted_data_bag_secret_key_path: test/data_bags/encrypted_data_bag_secret
       roles_path: test/roles
@@ -159,16 +159,16 @@ suites:
 #          git: https://github.com/bonusbits/inspec_bonusbits_base.git
         - path: ../inspec_bonusbits_base
       attributes:
-        chef_version: '12.19.36'
+        chef_version: '12.21.4'
         configure_backups: 'true'
         debug: 'true'
     includes: ["amazon-ec2"]
 
   - name: ec2_base_epel_repo
     provisioner:
       name: chef_zero
-      always_update_cookbooks: true
-      require_chef_omnibus: 12.19.36
+      # always_update_cookbooks: true
+      require_chef_omnibus: 12.21.4
       data_bags_path: test/data_bags
       encrypted_data_bag_secret_key_path: test/data_bags/encrypted_data_bag_secret
       roles_path: test/roles
@@ -204,15 +204,15 @@ suites:
         - name: bonusbits_base
           git: https://github.com/bonusbits/inspec_bonusbits_base.git
       attributes:
-        chef_version: '12.19.36'
+        chef_version: '12.21.4'
         configure_epel: 'true'
         install_epel_packages: 'true'
     includes: ["amazon-ec2"]
 
   - name: ec2_base_no_software
     provisioner:
       name: chef_zero
-      require_chef_omnibus: 12.19.36
+      require_chef_omnibus: 12.21.4
       data_bags_path: test/data_bags
       encrypted_data_bag_secret_key_path: test/data_bags/encrypted_data_bag_secret
       roles_path: test/roles
@@ -248,7 +248,7 @@ suites:
         - name: bonusbits_base
           git: https://github.com/bonusbits/inspec_bonusbits_base.git
       attributes:
-        chef_version: '12.19.36'
+        chef_version: '12.21.4'
         install_packages: 'false'
     includes: ["amazon-ec2"]
 
@@ -266,7 +266,7 @@ suites:
           git: https://github.com/bonusbits/inspec_bonusbits_base.git
 #        - path: ../inspec_bonusbits_base
       attributes:
-        chef_version: '12.19.36'
+        chef_version: '12.21.4'
     attributes:
       <% if ENV['CIRCLECI'] %>
       bonusbits_base:
@@ -287,7 +287,7 @@ suites:
         - name: bonusbits_base
           git: https://github.com/bonusbits/inspec_bonusbits_base.git
       attributes:
-        chef_version: '12.19.36'
+        chef_version: '12.21.4'
         configure_epel: 'true'
         install_epel_packages: 'true'
     attributes:
@@ -310,7 +310,7 @@ suites:
         - name: bonusbits_base
           git: https://github.com/bonusbits/inspec_bonusbits_base.git
       attributes:
-        chef_version: '12.19.36'
+        chef_version: '12.21.4'
         install_packages: 'false'
     attributes:
       <% if ENV['CIRCLECI'] %>

Berksfile.lock

@@ -0,0 +1,27 @@
+DEPENDENCIES
+  bonusbits_base
+    path: .
+    metadata: true
+  bonusbits_library
+    git: https://github.com/bonusbits/bonusbits_library.git
+    revision: 63a69ef3b1e8e54bc834383f69f64fdc710c2d10
+
+GRAPH
+  apt (6.1.3)
+  audit (4.2.0)
+    compat_resource (>= 0.0.0)
+  bonusbits_base (2.2.3)
+    apt (>= 0.0.0)
+    audit (>= 0.0.0)
+    bonusbits_library (>= 0.0.0)
+    selinux (>= 0.0.0)
+    windows (>= 0.0.0)
+    yum-epel (>= 0.0.0)
+  bonusbits_library (1.1.1)
+  compat_resource (12.19.0)
+  ohai (5.2.0)
+  selinux (2.0.3)
+  windows (3.1.2)
+    ohai (>= 4.0.0)
+  yum-epel (2.1.2)
+    compat_resource (>= 12.16.3)

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## CHANGE LOG
 
+## 2.2.3 - 08/26/2017 - Levon Becker
+* Bumped Chef Client version to 12.21.4 (Latest v12 release)
+* Added Berkshelf.lock to git commit to lock down dependent cookbook versions
+* Added Gemfile.lock to again work around CircleCI / Gemfile million entries so the exact gems I've used locally are used in the CI
+* Bumped Ruby version to 2.3.4 that comes with ChefDK 1.6.1 in Circle config
+* Downgraded Rake version since ChefDK 1.6.1 seems to have dropped rake 12 and went to version 10.4/10.5? odd
+
 ## 2.2.2 - 08/26/2017 - Levon Becker
 * Added Exclusions to backups
 * Change Backup S3 bucket name to path

Dockerfile

@@ -6,7 +6,7 @@ LABEL version="2.1.9" \
       website="https://www.bonusbits.com"
 
 # Build Cookbook Args
-#ARG chef_client_version=12.19.36
+#ARG chef_client_version=12.21.4
 ARG chefdk_version=1.3.40
 ARG cookbook_name=bonusbits_base
 ARG chef_role=base

Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
 gem 'berkshelf', '~> 5.6'
-gem 'rake', '~> 12.0'
+gem 'rake', '~> 10.4'
 
 group :style do
-  gem 'chef', '12.19.36'
+  gem 'chef', '12.21.4'
   gem 'foodcritic', '~> 10.2'
   gem 'rainbow', '~> 2.2.1'
   gem 'rubocop', '~> 0.47.1'
@@ -19,7 +19,7 @@ end
 
 group :integration do
   gem 'chef-zero', '~> 5.3'
-  gem 'inspec', '~> 1.19'
+  gem 'inspec', '~> 1.25'
   gem 'kitchen-docker', '~> 2.6.0'
   gem 'kitchen-ec2', '~> 1.3'
   gem 'kitchen-inspec', '~> 0.17'