Try to use docker buildx ls output again now that it seems to have been fixed

Author: taylorific

cookbooks/boxcutter_docker/libraries/default.rb

@@ -59,31 +59,24 @@ def self.context_rm(name, user, group)
       end
 
       # buildkits
-      def self.buildx_ls(home)
-        # Currently the output of `docker buildx ls --format ls` is essentially
-        # unparseable in an automated way. Work is being done to remedy this but
-        # doesn't seem like it will land anytime soon, so instead look where the
-        # config files are stored in ~/.docker/buildx
-        # https://github.com/docker/buildx/pull/830
-        buildx_instances_path = ::File.join(home, '.docker/buildx/instances')
-        config_map = {}
-        return config_map unless Dir.exist?(buildx_instances_path)
-        Dir.foreach(buildx_instances_path) do |filename|
-          next if ['.', '..'].include?(filename)
-
-          file_path = ::File.join(buildx_instances_path, filename)
-          if ::File.file?(file_path)
-            begin
-              json_content = ::File.read(file_path)
-              config_map[filename] = JSON.parse(json_content)
-            rescue JSON::ParserError => e
-              puts "Error parsing JSON in file #{filename}: #{e.message}"
-            rescue StandardError => e
-              puts "Error reading file #{filename}: #{e.message}"
-            end
-          end
+      def self.buildx_ls(user, group)
+        # https://github.com/docker/buildx/pull/1787
+        # https://github.com/docker/buildx/pull/2138
+        cmd = Mixlib::ShellOut.new(
+          'docker buildx ls --no-trunc --format json',
+          login: true,
+          user: user,
+          group: group,
+          ).run_command
+        cmd.error!
+        builder_instances = []
+        # `docker buildx ls` outputs multiple JSON objects, each on a new line.
+        # So we need to parse the output line by line and store each in an array
+        cmd.stdout.each_line do |line|
+          builder_instance = JSON.parse(line)
+          builder_instances.push(builder_instance)
         end
-        config_map
+        builder_instances
       end
 
       def self.buildx_create_command(name, config)

cookbooks/boxcutter_docker/resources/default.rb

@@ -7,9 +7,11 @@ class Helpers
 action :configure do
   # buildx
   node['boxcutter_docker']['buildx'].each do |user, user_config|
-    current_builders = Boxcutter::Docker::Helpers.buildx_ls(user_config['home'])
+    current_builders = Boxcutter::Docker::Helpers.buildx_ls(user_config['user'], user_config['group'])
     puts "MISCHA: current_builders=#{current_builders}"
-    current_builder_names = current_builders.values.map { |builder| builder['Name'] }.compact
+    docker_container_builders = current_builders.select { |builder| builder["Driver"] == 'docker-container' }
+    current_builder_names = docker_container_builders.values.map { |builder| builder['Name'] }.compact
+    # current_builder_names = current_builders.values.map { |builder| builder['Name'] }.compact
     puts "MISCHA: current_builder_names=#{current_builder_names}"
     desired_builder_names = user_config['builders'].values.map { |builder| builder['name'] }.compact
     puts "MISCHA: desired_builder_names=#{desired_builder_names}"