pfab 0.4.0 → 0.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/pfab/cli.rb +15 -14
- data/lib/pfab/templates/base.rb +7 -2
- 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: b9979c3fb7ac0f07322332db1eb53e54b510b3f28adca771c7a2a51f27696c14
|
4
|
+
data.tar.gz: e468d799e0c4547835dcfe7b261515f890728c5f1b00f2023522bd5871a5bd38
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: afb107189bd11eaac4f8c11cf127c21b163e3c97bb397692375b4bcfee69071b6b476312a49309c079bfd2fee1dda69fe061a8d835b6e23526f31d732022506f
|
7
|
+
data.tar.gz: fadaf09dd358eeb636b6e1ba12cca060933b98f7c32b3a8ab697b7f62ae1c27382a2454a21881bb51882205bdc958710f2dd2593bd3604a7debfdfe0dde84207
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.
|
1
|
+
0.5.0
|
data/lib/pfab/cli.rb
CHANGED
@@ -121,6 +121,7 @@ module Pfab
|
|
121
121
|
set_kube_context
|
122
122
|
app_name = get_app_name
|
123
123
|
puts_and_system("kubectl apply -f .application-k8s-#{$env}-#{app_name}.yaml")
|
124
|
+
puts_and_system("git tag release-#{$env}-#{app_name}-#{Time.now.strftime("%Y-%m-%d")} HEAD")
|
124
125
|
end
|
125
126
|
|
126
127
|
def cmd_build(force: false)
|
@@ -137,6 +138,19 @@ module Pfab
|
|
137
138
|
end
|
138
139
|
end
|
139
140
|
|
141
|
+
full_image_name = "#{container_repository}/#{image_name}:#{rev}"
|
142
|
+
|
143
|
+
cmd = "docker images -q #{full_image_name}"
|
144
|
+
say "Looking for images with #{cmd}"
|
145
|
+
existing = `#{cmd}`
|
146
|
+
|
147
|
+
if !existing.to_s.empty? && !force
|
148
|
+
say "Found image #{full_image_name} already, skipping prebuild, build & push"
|
149
|
+
return true
|
150
|
+
end
|
151
|
+
|
152
|
+
say "No image #{full_image_name} present, building"
|
153
|
+
|
140
154
|
prebuild = @application_yaml["prebuild"]
|
141
155
|
if prebuild.empty?
|
142
156
|
say "No prebuild task"
|
@@ -151,26 +165,13 @@ module Pfab
|
|
151
165
|
end
|
152
166
|
end
|
153
167
|
|
154
|
-
full_image_name = "#{container_repository}/#{image_name}:#{rev}"
|
155
|
-
|
156
|
-
cmd = "docker images -q #{full_image_name}"
|
157
|
-
say "Looking for images with #{cmd}"
|
158
|
-
existing = `#{cmd}`
|
159
|
-
|
160
|
-
if !existing.to_s.empty? && !force
|
161
|
-
say "Found image #{full_image_name} already, skipping build & push"
|
162
|
-
return
|
163
|
-
end
|
164
|
-
|
165
|
-
say "No image #{full_image_name} present, building"
|
166
|
-
|
167
168
|
puts_and_system "docker build -t #{image_name} ."
|
168
169
|
|
169
170
|
puts_and_system "docker tag #{image_name}:latest #{image_name}:#{rev}"
|
170
171
|
puts_and_system "docker tag #{image_name}:#{rev} #{full_image_name}"
|
171
172
|
|
172
173
|
puts_and_system "docker push #{container_repository}/#{image_name}:#{rev}"
|
173
|
-
|
174
|
+
return true
|
174
175
|
end
|
175
176
|
|
176
177
|
def cmd_generate_yaml
|
data/lib/pfab/templates/base.rb
CHANGED
@@ -46,9 +46,14 @@ module Pfab
|
|
46
46
|
def env_vars
|
47
47
|
|
48
48
|
env_vars = [
|
49
|
-
{ name: "DEPLOYED_NAME", value: @data['deployed_name'] }
|
49
|
+
{ name: "DEPLOYED_NAME", value: @data['deployed_name'] },
|
50
|
+
{ name: "DOGSTATSD_HOST_IP",
|
51
|
+
valueFrom: {
|
52
|
+
fieldRef: { fieldPath: "status.hostIP" }
|
53
|
+
}
|
54
|
+
},
|
50
55
|
]
|
51
|
-
|
56
|
+
|
52
57
|
load_env_vars(env_vars, @data["application_yaml"][:environment])
|
53
58
|
load_env_vars(env_vars, @data["application_yaml"][@data["env"]][:environment])
|
54
59
|
|
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.5.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.5.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 = "2019-01-
|
14
|
+
s.date = "2019-01-03"
|
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.5.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: 2019-01-
|
11
|
+
date: 2019-01-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: commander
|