fpm-fry 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40cca764e11751a11f15254d74ab7324d02adf9b6d2852822baaeb668600c5e2
-  data.tar.gz: d017698f4fae8e13f33eb99ddbd7bef77d8e6cdd9e3b0d57b1bb4082b5d21164
+  metadata.gz: 9ca47ad3fd38c121f59b67bbf3e90f598824306731f2a81cd01d7cb0bf051d37
+  data.tar.gz: 0af9052af2ee47c734bd96a5b110e7039f7e1b1703a9c8a3cca9da592c22dab9
 SHA512:
-  metadata.gz: 250eac98d2fce4db0ea393a4eaea6108df9b05dd40f1770acd56e74cd5456b615ceffc34a6097b1d9d607fe59508586f17e2f24f44e88893203b16c8d4d9d1fc
-  data.tar.gz: ca3d321f4ec3fd487cff204530a7831ec92641d726ce68a1a304e13a402cd8534cb6f9bcd3eff6cf9da2f2c8850898237797e007153c0a1125de6b9d53d381a2
+  metadata.gz: b3a4415764e58773095b4c72c0708e3cb4e72e157b3a379380c2a171996eb70cc63f7d81398b6af11542154adaddb892c19bbf4714d09cd993cf3aec5bc0b5b1
+  data.tar.gz: 4bbd41fef90429ca8fdcf360ad66c60859d83afdbb58835fa86442cd5e294b4ff51b4f9804f24add0ba3991f3aaa2f083c4305945b519b53ca84c170ecf5531a

data/lib/fpm/fry/client.rb

@@ -18,6 +18,10 @@ class FPM::Fry::Client
     include FPM::Fry::WithData
   end
 
+  class ContainerCreationFailed < StandardError
+    include FPM::Fry::WithData
+  end
+
   # Raised when trying to read file that can't be read e.g. because it's a
   # directory.
   class NotAFile < StandardError
@@ -183,7 +187,28 @@ class FPM::Fry::Client
   end
 
   def pull(image)
-    agent.post(path: url('images','create'), query: {'fromImage' => image})
+    last_status = ""
+    streamer = lambda do |chunk, remaining_bytes, total_bytes|
+      chunk.each_line do |line|
+        begin
+          msg = JSON.parse(line)
+          status, progress, id = *msg.values_at("status", "progress", "id")
+          id += ": " if id
+          status += " " if progress
+          move_up_one_line = $stdout.tty? && status =~ /Downloading|Extracting/ && last_status =~ /Downloading|Extracting/
+          last_status = status
+          cursor_move = move_up_one_line ? "\e[1A" : ""
+          puts [cursor_move, id, status, progress].join("")
+        rescue JSON::ParserError => e
+          $stderr.puts "Could not parse JSON response from docker: #{e}"
+        end
+      end
+    end
+    agent.post(path: url('images','create'), query: {'fromImage' => image}, :response_block => streamer)
+  end
+
+  def delete(image)
+    agent.delete(path: url('images',image), expects: [200, 404])
   end
 
   def create(image)
@@ -191,11 +216,19 @@ class FPM::Fry::Client
     res = agent.post(
       headers: { 'Content-Type' => 'application/json' },
       path: url,
-      body: JSON.generate('Image' => image)
+      body: JSON.generate('Image' => image),
     )
-    return JSON.parse(res.body)['Id']
+    data = JSON.parse(res.body)
+    if res.status != 201
+      @logger.error(data["message"])
+      if res.status == 404
+        @logger.info("execute docker pull #{image} first or specify --pull argument for fpm-fry")
+      end
+      raise ContainerCreationFailed.new("could not create container from #{image}", message: data["message"])
+    end
+    data['Id']
   rescue Excon::Error => e
-    @logger.error("could not create image: #{image}, url: #{url}, error: #{e}")
+    @logger.error("could not create container from #{image}, url: #{url}, error: #{e}")
     raise
   end
 

data/lib/fpm/fry/command/cook.rb

@@ -4,8 +4,9 @@ module FPM; module Fry
 
     option '--keep', :flag, 'Keep the container after build'
     option '--overwrite', :flag, 'Overwrite package', default: true
-    option '--verbose', :fag, 'Verbose output', default: false
+    option '--verbose', :flag, 'Verbose output', default: false
     option '--platform', 'PLATFORM', default: nil
+    option '--pull', :flag, 'Pull base image', default: false
 
     UPDATE_VALUES = ['auto','never','always']
     option '--update',"<#{UPDATE_VALUES.join('|')}>", 'Update image before installing packages ( only apt currently )', attribute_name: 'update', default: 'auto' do |value|
@@ -58,6 +59,7 @@ module FPM; module Fry
         b = nil
         Inspector.for_image(client, image) do |inspector|
           variables = Detector.detect(inspector)
+          variables[:architecture] = platform
           logger.debug("Loading recipe",variables: variables, recipe: recipe)
           b = Recipe::Builder.new(variables, logger: ui.logger, inspector: inspector)
           b.load_file( recipe )
@@ -202,6 +204,13 @@ module FPM; module Fry
       end
     end
 
+    def pull_base_image!
+      client.pull(image)
+    rescue Excon::Error
+      logger.error "could not pull base image #{image}"
+      raise
+    end
+
     def build!
       body = begin
               url = client.url('containers','create')
@@ -406,6 +415,8 @@ module FPM; module Fry
   public
 
     def execute
+      pull_base_image! if pull?
+
       # force some eager loading
       lint_recipe_file!
       builder

data/lib/fpm/fry/docker_file.rb

@@ -140,7 +140,7 @@ module FPM; module Fry
             if options[:update]
               update = 'apt-get update && '
             end
-            df[:dependencies] << "ENV DEBIAN_FRONTEND=noninteractive"
+            df[:dependencies] << "ARG DEBIAN_FRONTEND=noninteractive"
             df[:dependencies] << "RUN #{update}apt-get install --yes #{Shellwords.join(build_dependencies)}"
           when 'redhat'
             df[:dependencies] << "RUN yum -y install #{Shellwords.join(build_dependencies)}"

data/lib/fpm/fry/recipe/builder.rb

@@ -55,6 +55,10 @@ module FPM::Fry
         variables[:codename]
       end
 
+      def architecture
+        variables[:architecture]
+      end
+
       def iteration(value = Not)
         get_or_set('@iteration',value)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-fry
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Maxime Lagresle
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-13 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: FPM Fry