fpm-fry 0.7.1 → 0.7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15acbb0f9196652a3e2269a7e9dbfc9f3e0e215a42d7e24d03a955c17171ad5c
-  data.tar.gz: db1351dac3ce47056b35fc257eee88480292da50efa53c96cb5a14c68df8e794
+  metadata.gz: 4775633d070116e35a3bdfb7bdb0359d8af49b29b08f9b68e862b5dfd6a0a91d
+  data.tar.gz: b6b317af4559f1deeca752e42a96c9973885e1014caa0fd5fac22d6653644617
 SHA512:
-  metadata.gz: c73cf50dbd9e5e8105fbd37c8af6cf95655241121afa7ba0853b61b1a97e745f1d8ea1b6694dd492e9725f60b6296d443f0237b4837b9601d9bf678cdef9f442
-  data.tar.gz: 8a3aa11180a66194d08c7f9a7a643f3136b4455c74ba14b3342e4d6255cd034ad554a14b422540352075af055785bc1f4b2e101d3bc0f61874f77e92dd035881
+  metadata.gz: c05ab42fc6a12903c1987313a07cdb27b7fcbd46bf3b995f20745a7da7c358b1e00ffde004eeebdcf99a4ebe05069fb6f45e9c77b7d0a2de9c19874e9f70a86d
+  data.tar.gz: af93127bbfc24a0bf3de4250523e86004ec49548b4517e2f55b2ddb3bb30639f669889e2ee8b83bd58a8b21d2ff314b290c60c380be3962ef69882b6752c69c0

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|
@@ -203,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')
@@ -284,7 +292,7 @@ module FPM; module Fry
         logger: logger,
         client: client,
         keep_modified_files: builder.keep_modified_files,
-        verbose: verbose,
+        verbose: verbose?,
       )
       builder.recipe.apply_input(input)
       begin
@@ -407,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)}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-fry
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2.1
 platform: ruby
 authors:
 - Maxime Lagresle
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -43,82 +43,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.23
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.23
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: deep-fried package builder
 email: dennis.konert@new-work.se
 executables:
@@ -197,7 +121,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