phoebo 0.1.1 → 0.1.2
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/phoebo/config/image_commands.rb +1 -1
- data/lib/phoebo/docker/image_builder.rb +3 -2
- data/lib/phoebo/docker/image_pusher.rb +3 -2
- data/lib/phoebo/docker.rb +7 -0
- data/lib/phoebo/version.rb +1 -1
- data/phoebo.gemspec +2 -1
- data/spec/spec_helper.rb +3 -0
- metadata +15 -2
- data/.gitignore +0 -14
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b51f88a605d5610ffe5ad9a116133f1bfbd827a6
|
|
4
|
+
data.tar.gz: 5eab25352327affc5cd992d7992665ccaef95550
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9ab14f8c74e16a695d331ad31beb983b43e7b84506802861ab6fa177d69f2ad6193a7b212c8e06dd7605c9c55701d6f535583ab1770f69cc9d72848f5796b72b
|
|
7
|
+
data.tar.gz: ebf9b8b8d13cf6b8897e1a03aa0d39adedbad4d8c279001d13a0a839c045c654f1a0a82841cca73d769bd73466f3a4362dcca865dc47dbfe491a39f7bcb8a45e
|
|
@@ -59,8 +59,9 @@ module Phoebo
|
|
|
59
59
|
|
|
60
60
|
begin
|
|
61
61
|
stdout.puts "Building image " + "...".light_black
|
|
62
|
-
built_image = ::Docker::Image.build_from_tar(tar_stream.tap(&:rewind))
|
|
63
|
-
|
|
62
|
+
built_image = ::Docker::Image.build_from_tar(tar_stream.tap(&:rewind)) { |text|
|
|
63
|
+
Docker.process_output_stream(stdout, text)
|
|
64
|
+
}
|
|
64
65
|
|
|
65
66
|
# TODO: Perhaps we should calculate size from virtual size of the base,
|
|
66
67
|
# this is not working very well while merging layers.
|
|
@@ -21,9 +21,10 @@ module Phoebo
|
|
|
21
21
|
end
|
|
22
22
|
|
|
23
23
|
stdout.puts "Pushing image " + image_id.cyan + " ...".light_black
|
|
24
|
-
|
|
25
24
|
built_image = ::Docker::Image.get(image_id)
|
|
26
|
-
built_image.push
|
|
25
|
+
built_image.push { |text|
|
|
26
|
+
Docker.process_output_stream(stdout, text)
|
|
27
|
+
}
|
|
27
28
|
end
|
|
28
29
|
end
|
|
29
30
|
end
|
data/lib/phoebo/docker.rb
CHANGED
|
@@ -2,5 +2,12 @@ module Phoebo
|
|
|
2
2
|
module Docker
|
|
3
3
|
autoload :ImageBuilder, 'phoebo/docker/image_builder'
|
|
4
4
|
autoload :ImagePusher, 'phoebo/docker/image_pusher'
|
|
5
|
+
|
|
6
|
+
# Writes stripped streamed response to output stream
|
|
7
|
+
def self.process_output_stream(out, text)
|
|
8
|
+
if m = text.match(/^{"stream"\:"(.+?)\\n?"}/)
|
|
9
|
+
out.puts m[1].gsub(/\\u[0-9a-f]{4}/, '').light_black
|
|
10
|
+
end
|
|
11
|
+
end
|
|
5
12
|
end
|
|
6
13
|
end
|
data/lib/phoebo/version.rb
CHANGED
data/phoebo.gemspec
CHANGED
|
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
|
|
|
13
13
|
spec.homepage = "https://gitlab.fit.cvut.cz/phoebo/phoebo"
|
|
14
14
|
spec.license = "MIT"
|
|
15
15
|
|
|
16
|
-
spec.files = `git ls-files -z`.split("\x0")
|
|
16
|
+
spec.files = `git ls-files -z`.split("\x0") - %w(.gitignore Dockerfile wrapdocker)
|
|
17
17
|
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
|
|
18
18
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
|
19
19
|
spec.require_paths = ["lib"]
|
|
@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
|
|
|
26
26
|
spec.add_development_dependency "bundler", "~> 1.7"
|
|
27
27
|
spec.add_development_dependency "rake", "~> 10.0"
|
|
28
28
|
spec.add_development_dependency "rspec", '~> 3.0'
|
|
29
|
+
spec.add_development_dependency "simplecov", '~> 0.9.0'
|
|
29
30
|
end
|
data/spec/spec_helper.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: phoebo
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Adam Staněk
|
|
@@ -94,6 +94,20 @@ dependencies:
|
|
|
94
94
|
- - "~>"
|
|
95
95
|
- !ruby/object:Gem::Version
|
|
96
96
|
version: '3.0'
|
|
97
|
+
- !ruby/object:Gem::Dependency
|
|
98
|
+
name: simplecov
|
|
99
|
+
requirement: !ruby/object:Gem::Requirement
|
|
100
|
+
requirements:
|
|
101
|
+
- - "~>"
|
|
102
|
+
- !ruby/object:Gem::Version
|
|
103
|
+
version: 0.9.0
|
|
104
|
+
type: :development
|
|
105
|
+
prerelease: false
|
|
106
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
107
|
+
requirements:
|
|
108
|
+
- - "~>"
|
|
109
|
+
- !ruby/object:Gem::Version
|
|
110
|
+
version: 0.9.0
|
|
97
111
|
description: Phoebo creates ready-to-deploy Docker images from project Git repository
|
|
98
112
|
email:
|
|
99
113
|
- adam.stanek@v3net.cz
|
|
@@ -102,7 +116,6 @@ executables:
|
|
|
102
116
|
extensions: []
|
|
103
117
|
extra_rdoc_files: []
|
|
104
118
|
files:
|
|
105
|
-
- ".gitignore"
|
|
106
119
|
- ".rspec"
|
|
107
120
|
- Gemfile
|
|
108
121
|
- LICENSE.txt
|