fpm-fry 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4378e8616d6213898f76ec92b81ceed3cf591ac3f95dfb8d2cea75ea6ca0f2db
-  data.tar.gz: e148dd2f1c9326046fb184332527551d46240efd029d713ffedaa41b6ad690bc
+  metadata.gz: 40cca764e11751a11f15254d74ab7324d02adf9b6d2852822baaeb668600c5e2
+  data.tar.gz: d017698f4fae8e13f33eb99ddbd7bef77d8e6cdd9e3b0d57b1bb4082b5d21164
 SHA512:
-  metadata.gz: c6e0568bdf77a28ca62b093c3159e5a2a0eb13a157ed462ef6b77d2729a886f04434ab4c83ffe69a23e09c813053aa68730060a52f1ec3e3cd0ea6387702fba9
-  data.tar.gz: ac6d77bef4612f2252b27dfcb2926da85c9f6b244cf8705a8d028de63da5f2de4f62febe4a2fc23d0e32aa88d656369a7815110575c0e8b91bf1f0f34b6a2286
+  metadata.gz: 250eac98d2fce4db0ea393a4eaea6108df9b05dd40f1770acd56e74cd5456b615ceffc34a6097b1d9d607fe59508586f17e2f24f44e88893203b16c8d4d9d1fc
+  data.tar.gz: ca3d321f4ec3fd487cff204530a7831ec92641d726ce68a1a304e13a402cd8534cb6f9bcd3eff6cf9da2f2c8850898237797e007153c0a1125de6b9d53d381a2

data/lib/fpm/fry/client.rb

@@ -44,7 +44,7 @@ class FPM::Fry::Client
         ssl_verify_peer: options.fetch(:tlsverify){ false }
       }
       [:client_cert, :client_key, :ssl_ca_file].each do |k|
-        if !File.exists?(@tls[k])
+        if !File.exist?(@tls[k])
           raise ArgumentError.new("#{k} #{@tls[k]} doesn't exist. Did you set DOCKER_CERT_PATH correctly?")
         end
       end
@@ -228,6 +228,8 @@ class FPM::Fry::Client
     when 'unix'
       uri = "unix:///"
       options[:socket] = address
+      options[:host] = ""
+      options[:hostname] = ""
     when 'tcp'
       if tls.any?
         return agent_for("https://#{address}", tls)

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

@@ -5,9 +5,10 @@ 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 '--platform', 'PLATFORM', default: nil
 
     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|
+    option '--update',"<#{UPDATE_VALUES.join('|')}>", 'Update image before installing packages ( only apt currently )', attribute_name: 'update', default: 'auto' do |value|
       if !UPDATE_VALUES.include? value
         raise "Unknown value for --update: #{value.inspect}\nPossible values are #{UPDATE_VALUES.join(', ')}"
       else
@@ -80,7 +81,7 @@ module FPM; module Fry
     end
 
     def lint_recipe_file!
-      File.exists?(recipe) || raise(Recipe::NotFound)
+      File.exist?(recipe) || raise(Recipe::NotFound)
     end
 
     def lint_recipe!
@@ -124,11 +125,14 @@ module FPM; module Fry
         if res.status == 404
           df = DockerFile::Source.new(builder.variables.merge(image: image_id),cache)
           begin
-            url = client.url("build?rm=1&dockerfile=#{DockerFile::NAME}&t=#{cachetag}")
+            url = client.url("build")
+            query = { rm: 1, dockerfile: DockerFile::NAME, t: cachetag }
+            query[:platform] = platform if platform
             client.post(
               headers: {
                 'Content-Type'=>'application/tar'
               },
+              query: query,
               expects: [200],
               path: url,
               request_block: BlockEnumerator.new(df.tar_io)
@@ -145,11 +149,14 @@ module FPM; module Fry
         df = DockerFile::Build.new(cachetag, builder.variables.dup,builder.recipe, update: update?)
         parser = BuildOutputParser.new(out)
         begin
-          url = client.url("build?rm=1&dockerfile=#{DockerFile::NAME}")
+          url = client.url("build")
+          query = { rm: 1, dockerfile: DockerFile::NAME}
+          query[:platform] = platform if platform
           res = client.post(
             headers: {
               'Content-Type'=>'application/tar'
             },
+            query: query,
             expects: [200],
             path: url,
             request_block: BlockEnumerator.new(df.tar_io),
@@ -198,14 +205,16 @@ module FPM; module Fry
     def build!
       body = begin
               url = client.url('containers','create')
-              res = client.post(
+              args = {
                 headers: {
                   'Content-Type' => 'application/json'
                 },
                 path: url,
                 expects: [201],
                 body: JSON.generate({"Image" => build_image})
-              )
+              }
+              args[:query] = { platform: platform } if platform
+              res = client.post(args)
               JSON.parse(res.body)
             rescue Excon::Error
               logger.error "could not create #{build_image}, url: #{url}"
@@ -274,7 +283,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
@@ -331,6 +340,7 @@ module FPM; module Fry
 
       out_map.each do |output, package|
         package.apply_output(output)
+        adjust_package_architecture(output)
         adjust_package_settings(output)
         adjust_config_files(output)
       end
@@ -348,6 +358,11 @@ module FPM; module Fry
 
     end
 
+    def adjust_package_architecture(output)
+      # strip prefix and only use the architecture part
+      output.architecture = platform.split("/").last if platform
+    end
+
     def adjust_package_settings( output )
       # FPM ignores the file permissions on rpm packages.
       output.attributes[:rpm_use_file_permissions?] = true
@@ -368,7 +383,7 @@ module FPM; module Fry
       # Now that we have disabled this for debian we have to reenable if it for
       # all.
       etc = File.expand_path('etc', output.staging_path)
-      if File.exists?( etc )
+      if File.exist?( etc )
         # Config plugin wasn't used. Add everything under /etc
         prefix_length = output.staging_path.size + 1
         added = []

data/lib/fpm/fry/command.rb

@@ -12,7 +12,7 @@ module FPM; module Fry
 
     option '--debug', :flag, 'Turns on debugging'
     option '--[no-]tls', :flag, 'Turns on tls ( default is false for schema unix, tcp and http and true for https )'
-    option '--[no-]tlsverify', :flag, 'Turns off tls peer verification', default:true, environment_variable: 'DOCKER_TLS_VERIFY'
+    option '--[no-]tlsverify', :flag, 'Turns off tls peer verification', default: true, environment_variable: 'DOCKER_TLS_VERIFY'
     option ["-t", "--tmpdir"], "PATH", 'Write tmp data to PATH', default: '/tmp/fpm-fry', attribute_name: :dir do |s|
       String(s)
     end

data/lib/fpm/fry/source/git.rb

@@ -72,7 +72,7 @@ module FPM; module Fry ; module Source
 
       def update
         begin
-          if !File.exists? repodir
+          if !File.exist? repodir
             Exec::exec(package.git, "--git-dir=#{repodir}",'init', '--bare', description: "initializing git repository", logger: logger)
           end
           Exec::exec(package.git, "--git-dir=#{repodir}",'fetch','--depth=1', url.to_s, rev, description: 'fetching from remote', logger: logger)

data/lib/fpm/fry/source/patched.rb

@@ -118,7 +118,7 @@ module FPM; module Fry ; module Source
           raise ArgumentError, "Expected a Hash or a String, got #{file.inspect}"
         end
         options[:file] = File.expand_path(options[:file])
-        if !File.exists?(options[:file])
+        if !File.exist?(options[:file])
           raise ArgumentError, "File doesn't exist: #{options[:file]}"
         end
         options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-fry
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Maxime Lagresle
@@ -10,10 +10,10 @@ authors:
 - Hannes Georg
 - Julian Tabel
 - Dennis Konert
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -182,7 +182,7 @@ homepage: https://github.com/xing/fpm-fry
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -197,8 +197,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: FPM Fry
 test_files: []