fpm-fry 0.6.3 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d03481dd318deb8b40460423f2029cb88c6bac211d564ac79a5cee1bb39fc47
-  data.tar.gz: cea0a428ec17eb9efd64ca4cb13612f85f807876137f29a649f4445e930a2fe9
+  metadata.gz: 15acbb0f9196652a3e2269a7e9dbfc9f3e0e215a42d7e24d03a955c17171ad5c
+  data.tar.gz: db1351dac3ce47056b35fc257eee88480292da50efa53c96cb5a14c68df8e794
 SHA512:
-  metadata.gz: a503b0c59cc14c77ed9f68c917f8947458d919a439a79d40abea054e981ff3d47060b52e3a167e649e9e3775901832af088d999ccae99fd3ea30dc055a17ef81
-  data.tar.gz: 7164f000cb4591d21a2cd7c776e52d056c33e8523581f6bd864d25889b87b48d38a6e9794dd85ed7520734c88e8562675cc5b857b8bad8804600cb60f367b1de
+  metadata.gz: c73cf50dbd9e5e8105fbd37c8af6cf95655241121afa7ba0853b61b1a97e745f1d8ea1b6694dd492e9725f60b6296d443f0237b4837b9601d9bf678cdef9f442
+  data.tar.gz: 8a3aa11180a66194d08c7f9a7a643f3136b4455c74ba14b3342e4d6255cd034ad554a14b422540352075af055785bc1f4b2e101d3bc0f61874f77e92dd035881

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
@@ -57,6 +58,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 )
@@ -124,11 +126,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 +150,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 +206,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 +284,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 +341,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 +359,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

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/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.6.3
+  version: 0.7.1
 platform: ruby
 authors:
 - Maxime Lagresle
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon