shiplane_bootstrappers_chef 0.2.28 → 0.2.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55683aeb97bd05556de2ca191bc0b48779ba06c5b45b0458a7c5f30cec0225ee
-  data.tar.gz: f4d4c84740ed3b41a80da4aa315ddec2e87f8e42765d567b9cc0eb4d9afc4726
+  metadata.gz: a6d29ad3a3a7434e9da97c867151a37ea34fc799a3f8884c225f9c11e1afe1bf
+  data.tar.gz: a47ed9a06d84af0f229f3380bc2d00862bcc88e325731bfdd66d216412697f8a
 SHA512:
-  metadata.gz: 075ddfd6ff005d5c13dd0490359097a38489b407c8209ff9840b684f2e8ba59b7a5373b1f55ac80f7ca43e8b38ab24cdef5805bbb405b9dfa87e0cde9e492758
-  data.tar.gz: 533dc11dce6a49b8847e7a61d5572376efdc6c152e719d61fe456ede73b2d83b2a074dd0b22fa653c6275ca11a6cd609c44f2aa3378aa685fef570a4fbffe0fd
+  metadata.gz: e3337a60fd53aedb6e479cc457b05a9539ded3262138bc28ee3e72a8b066c3888509ddc74054fc9e1558b42dd5df65460461572239f90e23efea0f0752ccf38d
+  data.tar.gz: 26a0266410e16eb63b1220de4829c990be5f9fa3ec871e84f9f96bf72fd86548223a7818e0ee3aed8590157b3e8a457218884c4deb09cc3a4d2ea5e3aa47995a

data/lib/capistrano/chef_host.rb

@@ -66,12 +66,11 @@ module Shiplane
     def configure
       with_context do
         errors = {}
-        SSHKit.config.default_env["CHEF_LICENSE"] = "accept"
         SSHKit::Coordinator.new(host).each in: :parallel do |h|
           context_variables = fetch(:shiplane_sshkit_values)
 
           begin
-            execute :sudo, 'chef-solo', '-c', "#{Shiplane::ChefHost::REMOTE_CHEF_FOLDER_PATH}/solo.rb", interaction_handler: context_variables[:interaction_handler]
+            execute :sudo, 'chef-solo', '-c', "#{Shiplane::ChefHost::REMOTE_CHEF_FOLDER_PATH}/solo.rb", "--chef-license=accept", interaction_handler: context_variables[:interaction_handler]
           rescue => e
             errors["#{h}"] = Shiplane::ChefErrorParser.parse(e)
           end

data/lib/capistrano/tasks/provision.rake

@@ -2,6 +2,8 @@ require 'rake'
 require 'dotenv'
 require 'open3'
 
+require_relative '../../../../../lib/shiplane/safe_yaml_loading'
+
 desc "Provision host"
 task :provision, [:role, :username, :keypath] => ['provision:default']
 
@@ -200,7 +202,7 @@ class HostOptions
   end
 
   def config
-    @config ||= YAML.load(File.read(config_file_path))['capistrano']
+    @config ||= Shiplane::SafeYamlLoading.load_file(config_file_path)['capistrano']
   end
 
   def ssh_options

data/lib/chef/nodes/docker.json.erb

@@ -3,7 +3,9 @@
   "barebones-docker": {
     "ssl": true,
     "cert_path": "/etc/lego/certificates/",
-    "docker": {},
+    "docker": {
+      "version": "27.3.1"
+    },
     "group": {
       "name": "docker"
     },

data/lib/chef/roles/docker.json

@@ -5,12 +5,6 @@
   },
   "json_class": "Chef::Role",
   "run_list": [
-    "recipe[n2docker::default]"
   ],
   "chef_type": "role",
-  "override_attributes": {
-    "n2docker": {
-      "version": "18.03.1"
-    }
-  }
 }

data/lib/shiplane/bootstrappers/chef/version.rb

@@ -3,7 +3,7 @@
 module Shiplane
   module Bootstrappers
     module Chef
-      VERSION = "0.2.28"
+      VERSION = "0.2.30"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiplane_bootstrappers_chef
 version: !ruby/object:Gem::Version
-  version: 0.2.28
+  version: 0.2.30
 platform: ruby
 authors:
 - John Epperson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano