fpm-fry 0.7.3 → 0.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/fpm/fry/client.rb +4 -2
- data/lib/fpm/fry/command/cook.rb +2 -2
- data/lib/fpm/fry/command.rb +1 -1
- metadata +20 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5c84a20f83300f3f9793e0680dc5573be7e579303df7420ef9872855824ffcc8
|
4
|
+
data.tar.gz: 3dd82f0cc8368c27ed708fee9ac233901004bd8fca5b14fac0d5d911c2a8499a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1954a12b44d375a0f07b664eb5eaf705ef772b4e67ec8fd4723675e0bbfc888006a2997cb4d3826cd1cd5fc71dc08051aa38e4b8fca1ae0e8f6b7dd50e8b8b2a
|
7
|
+
data.tar.gz: 23f211f530e0ddd1eda1fffc77bfddbec8d397c9746096b22cb95875c8a60daf6e829d8d9533728eabe65aa4e49de6a74af2ec521ed8e51ced483cf58b464e76
|
data/lib/fpm/fry/client.rb
CHANGED
@@ -190,7 +190,7 @@ class FPM::Fry::Client
|
|
190
190
|
raise
|
191
191
|
end
|
192
192
|
|
193
|
-
def pull(image)
|
193
|
+
def pull(image, platform: nil)
|
194
194
|
last_status = ""
|
195
195
|
streamer = lambda do |chunk, remaining_bytes, total_bytes|
|
196
196
|
chunk.each_line do |line|
|
@@ -208,7 +208,9 @@ class FPM::Fry::Client
|
|
208
208
|
end
|
209
209
|
end
|
210
210
|
end
|
211
|
-
|
211
|
+
query = {'fromImage' => image}
|
212
|
+
query['platform'] = platform if platform
|
213
|
+
agent.post(path: url('images','create'), query: query, :response_block => streamer)
|
212
214
|
end
|
213
215
|
|
214
216
|
def delete(image)
|
data/lib/fpm/fry/command/cook.rb
CHANGED
@@ -24,7 +24,7 @@ module FPM; module Fry
|
|
24
24
|
parameter 'image', 'Docker image to build from'
|
25
25
|
parameter '[recipe]', 'Recipe file to cook', default: 'recipe.rb'
|
26
26
|
|
27
|
-
def initialize(invocation_path, ctx = {}
|
27
|
+
def initialize(invocation_path, ctx = {})
|
28
28
|
@tls = nil
|
29
29
|
require 'digest'
|
30
30
|
require 'fileutils'
|
@@ -209,7 +209,7 @@ module FPM; module Fry
|
|
209
209
|
end
|
210
210
|
|
211
211
|
def pull_base_image!
|
212
|
-
client.pull(image)
|
212
|
+
client.pull(image, platform: platform)
|
213
213
|
rescue Excon::Error
|
214
214
|
logger.error "could not pull base image #{image}"
|
215
215
|
raise
|
data/lib/fpm/fry/command.rb
CHANGED
@@ -23,7 +23,7 @@ module FPM; module Fry
|
|
23
23
|
extend Forwardable
|
24
24
|
def_delegators :ui, :out, :err, :logger, :tmpdir
|
25
25
|
|
26
|
-
def initialize(invocation_path, ctx = {}
|
26
|
+
def initialize(invocation_path, ctx = {})
|
27
27
|
super
|
28
28
|
@ui = ctx.fetch(:ui){ UI.new(tmpdir: dir) }
|
29
29
|
@client = ctx[:client]
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fpm-fry
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.8.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Maxime Lagresle
|
@@ -10,10 +10,11 @@ authors:
|
|
10
10
|
- Hannes Georg
|
11
11
|
- Julian Tabel
|
12
12
|
- Dennis Konert
|
13
|
+
- Bruno Escherl
|
13
14
|
autorequire:
|
14
15
|
bindir: bin
|
15
16
|
cert_chain: []
|
16
|
-
date: 2024-
|
17
|
+
date: 2024-12-12 00:00:00.000000000 Z
|
17
18
|
dependencies:
|
18
19
|
- !ruby/object:Gem::Dependency
|
19
20
|
name: excon
|
@@ -35,14 +36,28 @@ dependencies:
|
|
35
36
|
requirements:
|
36
37
|
- - "~>"
|
37
38
|
- !ruby/object:Gem::Version
|
38
|
-
version: '1.
|
39
|
+
version: '1.16'
|
39
40
|
type: :runtime
|
40
41
|
prerelease: false
|
41
42
|
version_requirements: !ruby/object:Gem::Requirement
|
42
43
|
requirements:
|
43
44
|
- - "~>"
|
44
45
|
- !ruby/object:Gem::Version
|
45
|
-
version: '1.
|
46
|
+
version: '1.16'
|
47
|
+
- !ruby/object:Gem::Dependency
|
48
|
+
name: clamp
|
49
|
+
requirement: !ruby/object:Gem::Requirement
|
50
|
+
requirements:
|
51
|
+
- - ">"
|
52
|
+
- !ruby/object:Gem::Version
|
53
|
+
version: 1.1.0
|
54
|
+
type: :runtime
|
55
|
+
prerelease: false
|
56
|
+
version_requirements: !ruby/object:Gem::Requirement
|
57
|
+
requirements:
|
58
|
+
- - ">"
|
59
|
+
- !ruby/object:Gem::Version
|
60
|
+
version: 1.1.0
|
46
61
|
description: deep-fried package builder
|
47
62
|
email: dennis.konert@new-work.se
|
48
63
|
executables:
|
@@ -121,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
121
136
|
- !ruby/object:Gem::Version
|
122
137
|
version: '0'
|
123
138
|
requirements: []
|
124
|
-
rubygems_version: 3.
|
139
|
+
rubygems_version: 3.5.22
|
125
140
|
signing_key:
|
126
141
|
specification_version: 4
|
127
142
|
summary: FPM Fry
|