blubber 0.1.9 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/blubber/builder.rb +1 -1
- data/lib/blubber/flow.rb +6 -3
- data/lib/blubber/runner.rb +11 -8
- data/lib/blubber/tagger.rb +11 -11
- data/lib/blubber/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2fc43a8d69b7d4d93a797191b720892f7b8ad4a853f450d6177cb32064a03ebc
|
4
|
+
data.tar.gz: b56d0301887bc29ab7dbf07328db241f7230afc7ee101cf475350250187c1850
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cb8a7675b4959203c9675d3dd1e35cc645924f8e66638e5c94d5b4a9f1d19eea96aba8c662a32c8e51e0c1b5b9d6adae157c5b471cfc274849644d2602cec767
|
7
|
+
data.tar.gz: b6696c0121a6cc8fef1e541c1e4b0216171e7cfa476370b06a9fee5e74400d4fa2eab841aa129e03230413b43e5253d1fe004db7eed36eb85510bc414dd8b4fe
|
data/lib/blubber/builder.rb
CHANGED
@@ -45,7 +45,7 @@ module Blubber
|
|
45
45
|
def build(layer)
|
46
46
|
status = nil
|
47
47
|
Dir.chdir(layer) do
|
48
|
-
status = runner.run(
|
48
|
+
status = runner.run("docker build --build-arg BRANCH_NAME=#{tagger.branch_name} .") do |stdout, _, _|
|
49
49
|
if stdout && (m = stdout.match(/Successfully built ([a-z0-9]{12})/))
|
50
50
|
build_ids[layer] = m[1]
|
51
51
|
end
|
data/lib/blubber/flow.rb
CHANGED
@@ -29,8 +29,13 @@ module Blubber
|
|
29
29
|
|
30
30
|
def self.changed_layers
|
31
31
|
@changed_layers ||= begin
|
32
|
-
if ENV
|
32
|
+
if ENV.fetch('GIT_PREVIOUS_SUCCESSFUL_COMMIT', '').empty? || ENV['BUILD_ALL'] == 'true'
|
33
|
+
Dir['**/*/Dockerfile'].map { |d| File.dirname(d) }.sort
|
34
|
+
else
|
33
35
|
commit = ENV['GIT_COMMIT'] || `git rev-parse HEAD`.strip
|
36
|
+
|
37
|
+
puts "Detecting changed layers between #{ENV['GIT_PREVIOUS_SUCCESSFUL_COMMIT']}..#{commit}"
|
38
|
+
|
34
39
|
changes = `git diff --name-only #{ENV['GIT_PREVIOUS_SUCCESSFUL_COMMIT']}..#{commit}`.split("\n")
|
35
40
|
paths = []
|
36
41
|
changes.each do |path|
|
@@ -40,8 +45,6 @@ module Blubber
|
|
40
45
|
end
|
41
46
|
end
|
42
47
|
paths
|
43
|
-
else
|
44
|
-
Dir['**/*/Dockerfile'].map { |d| File.dirname(d) }.sort
|
45
48
|
end
|
46
49
|
end
|
47
50
|
end
|
data/lib/blubber/runner.rb
CHANGED
@@ -12,15 +12,18 @@ module Blubber
|
|
12
12
|
# read each stream from a new thread
|
13
13
|
{ out: stdout, err: stderr }.each do |key, stream|
|
14
14
|
Thread.new do
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
15
|
+
begin
|
16
|
+
until (line = stream.gets).nil?
|
17
|
+
# yield the block depending on the stream
|
18
|
+
if key == :out
|
19
|
+
logger.info line.strip
|
20
|
+
yield line, nil, thread if block_given?
|
21
|
+
else
|
22
|
+
logger.error line.strip
|
23
|
+
yield nil, line, thread if block_given?
|
24
|
+
end
|
23
25
|
end
|
26
|
+
rescue IOError
|
24
27
|
end
|
25
28
|
end
|
26
29
|
end
|
data/lib/blubber/tagger.rb
CHANGED
@@ -22,13 +22,6 @@ module Blubber
|
|
22
22
|
push
|
23
23
|
end
|
24
24
|
|
25
|
-
def project
|
26
|
-
[
|
27
|
-
Tagger.docker_registry,
|
28
|
-
*layer.split('/').select { |p| p[/[a-z0-9]+/] }
|
29
|
-
].join('/')
|
30
|
-
end
|
31
|
-
|
32
25
|
def tags
|
33
26
|
@tags ||= begin
|
34
27
|
tags = []
|
@@ -45,6 +38,17 @@ module Blubber
|
|
45
38
|
end
|
46
39
|
end
|
47
40
|
|
41
|
+
def project
|
42
|
+
[
|
43
|
+
Tagger.docker_registry,
|
44
|
+
*layer.split('/').select { |p| p[/[a-z0-9]+/] }
|
45
|
+
].join('/')
|
46
|
+
end
|
47
|
+
|
48
|
+
def branch_name
|
49
|
+
@branch_name ||= ENV['BRANCH_NAME'] || `git rev-parse HEAD | git branch -a --contains | sed -n 2p | cut -d'/' -f 3-`.strip
|
50
|
+
end
|
51
|
+
|
48
52
|
private
|
49
53
|
|
50
54
|
attr_reader :layer, :image_id, :logger
|
@@ -65,10 +69,6 @@ module Blubber
|
|
65
69
|
@commit ||= ENV['GIT_COMMIT'] || `git rev-parse HEAD`.strip
|
66
70
|
end
|
67
71
|
|
68
|
-
def branch_name
|
69
|
-
@branch_name ||= ENV['BRANCH_NAME'] || `git rev-parse HEAD | git branch -a --contains | sed -n 2p | cut -d'/' -f 3-`.strip
|
70
|
-
end
|
71
|
-
|
72
72
|
def push
|
73
73
|
status = true
|
74
74
|
tags.each do |tag|
|
data/lib/blubber/version.rb
CHANGED