pfab 0.17.0 → 0.18.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.markdown +1 -1
- data/lib/pfab/cli.rb +8 -19
- data/lib/pfab/templates/web.rb +2 -8
- data/lib/pfab/version.rb +1 -1
- data/pfab.gemspec +3 -3
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 39b274de173e627baf79bb67bceee55639a095a503709b3dc8b96076d6374e93
|
4
|
+
data.tar.gz: c94f1bce1be02fbe2158d6a1b51fede74379bf5a2234ec4fe53f08045d24171f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9950a8bd021e9f1cbd2a41463a7a1a121e62d72b4841f0e798beb7b4788cb560b0b665aa5dc9d300031100efef71f9f466d257b67a6c35f4648bb010edc0d9cc
|
7
|
+
data.tar.gz: 632de04acb276119e836be46d479b10d32ae38598bd09497f5d1eb3aad95e3df4d8a3c1d9b5674ff60e287fcd4cd5ed10460a62d1590f245a8961b42744a3bf6
|
data/README.markdown
CHANGED
data/lib/pfab/cli.rb
CHANGED
@@ -209,12 +209,11 @@ module Pfab
|
|
209
209
|
|
210
210
|
full_image_name = "#{container_repository}/#{image_name}:#{rev}"
|
211
211
|
|
212
|
-
|
213
|
-
cmd = "docker manifest inspect #{full_image_name} > /dev/null ; echo $?"
|
212
|
+
cmd = "docker images -q #{full_image_name}"
|
214
213
|
say "Looking for images with #{cmd}"
|
215
|
-
existing = `#{cmd}
|
214
|
+
existing = `#{cmd}`
|
216
215
|
|
217
|
-
if existing
|
216
|
+
if !existing.to_s.empty? && !force
|
218
217
|
say "Found image #{full_image_name} already, skipping prebuild, build & push"
|
219
218
|
return true
|
220
219
|
end
|
@@ -235,23 +234,13 @@ module Pfab
|
|
235
234
|
end
|
236
235
|
end
|
237
236
|
|
238
|
-
|
239
|
-
puts build_cmd
|
240
|
-
result = system(build_cmd)
|
237
|
+
puts_and_system "docker build -t #{image_name} --platform amd64 ."
|
241
238
|
|
242
|
-
|
243
|
-
|
244
|
-
if result
|
245
|
-
puts_and_system "docker tag #{image_name}:latest #{image_name}:#{rev}"
|
246
|
-
puts_and_system "docker tag #{image_name}:#{rev} #{full_image_name}"
|
247
|
-
|
248
|
-
puts_and_system "docker push #{container_repository}/#{image_name}:#{rev}"
|
249
|
-
return true
|
250
|
-
else
|
251
|
-
say "Build Did Not Succeed"
|
252
|
-
return false
|
253
|
-
end
|
239
|
+
puts_and_system "docker tag #{image_name}:latest #{image_name}:#{rev}"
|
240
|
+
puts_and_system "docker tag #{image_name}:#{rev} #{full_image_name}"
|
254
241
|
|
242
|
+
puts_and_system "docker push #{container_repository}/#{image_name}:#{rev}"
|
243
|
+
return true
|
255
244
|
end
|
256
245
|
|
257
246
|
def yy
|
data/lib/pfab/templates/web.rb
CHANGED
@@ -21,8 +21,7 @@ module Pfab
|
|
21
21
|
labels: {
|
22
22
|
application: @data['application'],
|
23
23
|
"deployed-name" => @data['deployed_name'],
|
24
|
-
}
|
25
|
-
annotations: service_annotations,
|
24
|
+
}
|
26
25
|
},
|
27
26
|
spec: {
|
28
27
|
selector: {
|
@@ -39,12 +38,6 @@ module Pfab
|
|
39
38
|
}
|
40
39
|
end
|
41
40
|
|
42
|
-
def service_annotations
|
43
|
-
h = {}
|
44
|
-
h["traefik.ingress.kubernetes.io/service.serversscheme"] = "h2c" if get("protocol") == "h2c"
|
45
|
-
h
|
46
|
-
end
|
47
|
-
|
48
41
|
def ingress
|
49
42
|
{
|
50
43
|
apiVersion: "networking.k8s.io/v1",
|
@@ -114,6 +107,7 @@ module Pfab
|
|
114
107
|
"traefik.ingress.kubernetes.io/router.entrypoints" => "websecure",
|
115
108
|
"traefik.ingress.kubernetes.io/router.tls" => "true"
|
116
109
|
}
|
110
|
+
h["ingress.kubernetes.io/protocol"] = "h2c" if get("protocol") == "h2c"
|
117
111
|
h
|
118
112
|
end
|
119
113
|
|
data/lib/pfab/version.rb
CHANGED
data/pfab.gemspec
CHANGED
@@ -2,16 +2,16 @@
|
|
2
2
|
# DO NOT EDIT THIS FILE DIRECTLY
|
3
3
|
# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
|
4
4
|
# -*- encoding: utf-8 -*-
|
5
|
-
# stub: pfab 0.
|
5
|
+
# stub: pfab 0.18.0 ruby lib
|
6
6
|
|
7
7
|
Gem::Specification.new do |s|
|
8
8
|
s.name = "pfab".freeze
|
9
|
-
s.version = "0.
|
9
|
+
s.version = "0.18.0"
|
10
10
|
|
11
11
|
s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
|
12
12
|
s.require_paths = ["lib".freeze]
|
13
13
|
s.authors = ["Jeff Dwyer".freeze]
|
14
|
-
s.date = "2022-
|
14
|
+
s.date = "2022-07-16"
|
15
15
|
s.description = "k8s helper".freeze
|
16
16
|
s.email = "jdwyer@prefab.cloud".freeze
|
17
17
|
s.executables = ["pfab".freeze]
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: pfab
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.18.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jeff Dwyer
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-07-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: commander
|