shiplane_bootstrappers_chef 0.1.14 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4030ed72c0135d66b257116dac76d2cafc9c8e6bc21eb0c79e78ad50c1277dfc
-  data.tar.gz: 2639e7074d24a4fc0f8fb555b28c9529eeda294964ac0cf096d8c50f90068cd2
+  metadata.gz: 1451a74466fca827914195ec0d3cc14ae82beeceb548bd4e1d99c2092c035446
+  data.tar.gz: d81665d8edd1ddd696c2991776a53a3b89abf0ba55b2571dbba5148d6f61c711
 SHA512:
-  metadata.gz: 9af17b09e7a1881938c2bb363c02acdc2a72c91472d7084e490a84ea7e0924606730c71e7c592a61dc7cbf75d48f7955655d451ffbab8dda3cd9f1de1182a353
-  data.tar.gz: 11e1ea0e93c5eb40b9669b2cf69d4b5b6b816fc29d9e3f8a1b09213ce1fe2e1c79d6f3e90a25719d11cb5925dfda6c9bf4b5747f71d5d8460088952f4d63ed4c
+  metadata.gz: d7da41d8aa8cc3c65fdb5b9f7b79420b4a6bcca1e17466719e090acc8810881e64c6ab0296f4b56d07b5b7d5bb84cfa4390f24cae0ac119109b09e178fb83047
+  data.tar.gz: 65dd0b85a3db69e5ee288b7695bd0275579c04df3384c7daacc505be0a700b7caa4f4253116005a453846cceb5ea0fc82d8d9b1cdf303485711ed91ef1f2bafa

data/lib/capistrano/chef_host.rb

@@ -28,6 +28,8 @@ module Shiplane
           end
 
           unless install_finished
+            execute :sudo, :sysctl, "-w", "net.ipv6.conf.all.disable_ipv6=1", interaction_handler: context_variables[:interaction_handler]
+            execute :sudo, :sysctl, "-w", "net.ipv6.conf.default.disable_ipv6=1", interaction_handler: context_variables[:interaction_handler]
             execute :sudo, :mkdir, '-m', '2777', '-p', Shiplane::ChefHost::REMOTE_CHEF_FOLDER_PATH, interaction_handler: context_variables[:interaction_handler]
             execute :sudo, :touch, File.join(Shiplane::ChefHost::REMOTE_CHEF_FOLDER_PATH, '.install-started'), interaction_handler: context_variables[:interaction_handler]
             execute :sudo, 'apt-get', 'update', interaction_handler: context_variables[:interaction_handler]
@@ -36,6 +38,20 @@ module Shiplane
             execute :sudo, :dpkg, '-i', Shiplane::ChefHost::CHEF_PACKAGE_NAME, interaction_handler: context_variables[:interaction_handler]
             execute :sudo, :ls, '-al', Shiplane::ChefHost::REMOTE_CHEF_FOLDER_PATH, interaction_handler: context_variables[:interaction_handler]
             execute :sudo, :touch, File.join(Shiplane::ChefHost::REMOTE_CHEF_FOLDER_PATH, '.install'), interaction_handler: context_variables[:interaction_handler]
+            execute :sudo, :sysctl, "-w", "net.ipv6.conf.all.disable_ipv6=0", interaction_handler: context_variables[:interaction_handler]
+            execute :sudo, :sysctl, "-w", "net.ipv6.conf.default.disable_ipv6=0", interaction_handler: context_variables[:interaction_handler]
+          end
+        end
+      end
+    end
+
+    def reinstall
+      with_context do
+        SSHKit::Coordinator.new(host).each in: :parallel do
+          context_variables = fetch(:shiplane_sshkit_values)
+
+          if(test("[ -f #{File.join(Shiplane::ChefHost::REMOTE_CHEF_FOLDER_PATH, '.install')} ]"))
+            execute :sudo, :rm, File.join(Shiplane::ChefHost::REMOTE_CHEF_FOLDER_PATH, '.install'), interaction_handler: context_variables[:interaction_handler]
           end
         end
       end
@@ -48,7 +64,7 @@ module Shiplane
           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/bootstrap.rake

@@ -24,6 +24,11 @@ namespace :shiplane do
     task :evaluate_erb_files, :username, :keypath do |task, args|
       Dotenv.load Shiplane::ChefHost.env_file
       on fetch(:shiplane_hosts).map(&:capistrano_role) do |host|
+        @shiplane_users = [
+          "docker",
+          host.user,
+        ].compact.uniq.join("\",\"")
+
         Dir["#{File.expand_path("../../../chef", __FILE__)}/**/*.erb"].map do |filename|
           compiled_template = ERB.new(File.read(filename)).result(binding)
           compiled_file_name = filename.match(/.*\/chef\/(.*)\.erb/)[1]

data/lib/capistrano/tasks/shiplane_bootstrap.rake

@@ -3,14 +3,16 @@ namespace :shiplane do
   task :bootstrap, [:role] => ['bootstrap:default']
 
   namespace :bootstrap do
-    task :default, [:role] do |task, args|
+    task :setup, [:role] do |task, args|
       filter = args.fetch('role', 'all')
       hosts = roles(filter).map do |host|
         Shiplane::ChefHost.new(host, env)
       end
 
       set :shiplane_hosts, hosts
+    end
 
+    task :default, [:role] => :setup do |task, args|
       %w{ prepare install configure cleanup }.each do |task|
         invoke "shiplane:bootstrap:#{task}"
       end
@@ -22,6 +24,12 @@ namespace :shiplane do
     task :install do
     end
 
+    task reinstall: :setup do
+      %w{ prepare reinstall install configure cleanup }.each do |task|
+        invoke "shiplane:bootstrap:#{task}"
+      end
+    end
+
     task :configure do
     end
 

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

@@ -9,9 +9,7 @@
     "group": {
       "name": "docker"
     },
-    "user": {
-      "name": "docker"
-    }
+    "users": ["<%= @shiplane_users %>"]
   },
   "run_list":
   [

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

@@ -3,7 +3,7 @@
 module Shiplane
   module Bootstrappers
     module Chef
-      VERSION = "0.1.14"
+      VERSION = "0.2.2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiplane_bootstrappers_chef
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.2
 platform: ruby
 authors:
 - John Epperson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-03 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -90,6 +90,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.8
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 description: Converts docker-compose.yml files into images that can be uploaded to
   any docker image repository.
 email:
@@ -122,7 +142,7 @@ homepage: https://github.com/kirillian/shiplane
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,9 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A toolbox for converting developer docker-compose files into production-ready
   images.