rbbt-image 0.1.11 → 0.1.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/run_rbbt_docker.rb +7 -5
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e88f118828855b76046ddb2986060361b3f11df7
|
|
4
|
+
data.tar.gz: d78897244f68a6aa7c85ea793a621f981ef8a023
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b28949375a40a1a29334e3dac657a5ddd985269772b128128ab001514b601d7a79dd84501d518f57368c1724edad4da157fc3f0763207a23408f5748a7bc3bda
|
|
7
|
+
data.tar.gz: 2e2c08b1370befbb1fda04ac5c5d157753efc7ff4f56f502e2987276a7bad99e4652eb50857901e0962014c7433d19559ef2d44bf125bcbafdcc0f84f85bb49e
|
data/bin/run_rbbt_docker.rb
CHANGED
|
@@ -55,7 +55,8 @@ IndiferentHash.setup(infrastructure)
|
|
|
55
55
|
image = infrastructure[:image]
|
|
56
56
|
|
|
57
57
|
if user = infrastructure[:user]
|
|
58
|
-
user_conf = "-u #{user} -e HOME=/home/#{user}/ "
|
|
58
|
+
user_conf = "-u #{user} -e HOME=/home/#{user}/ -e USER=#{user}"
|
|
59
|
+
user_conf = "-e HOME=/home/#{user}/ -e USER=#{user}"
|
|
59
60
|
else
|
|
60
61
|
user_conf = ""
|
|
61
62
|
end
|
|
@@ -63,12 +64,12 @@ end
|
|
|
63
64
|
mount_conf = ""
|
|
64
65
|
if infrastructure[:mounts]
|
|
65
66
|
infrastructure[:mounts].each do |target,source|
|
|
66
|
-
target = target.gsub("USER", user)
|
|
67
|
+
target = target.gsub("USER", user) if target.include? "USER"
|
|
67
68
|
if source.nil? or source.empty?
|
|
68
69
|
mount_conf << " -v #{target}"
|
|
69
70
|
else
|
|
70
71
|
FileUtils.mkdir_p source unless File.directory? source
|
|
71
|
-
FileUtils.chmod 0777, source
|
|
72
|
+
#FileUtils.chmod 0777, source
|
|
72
73
|
mount_conf << " -v #{File.expand_path(source)}:#{target}"
|
|
73
74
|
end
|
|
74
75
|
end
|
|
@@ -78,8 +79,9 @@ if infrastructure[:workflow_autoinstall] and infrastructure[:workflow_autoinstal
|
|
|
78
79
|
cmd = "env RBBT_WORKFLOW_AUTOINSTALL=true " + cmd
|
|
79
80
|
end
|
|
80
81
|
|
|
81
|
-
|
|
82
|
-
cmd_str
|
|
82
|
+
umask = infrastructure[:umask] ? 'umask 000; ' : ''
|
|
83
|
+
cmd_str = "docker run #{mount_conf} #{user_conf} #{docker_args*" "} #{image} /bin/bash --login -c '#{umask}#{cmd} #{cmd_args*" "}"
|
|
84
|
+
cmd_str += " --log #{Log.severity} " if cmd =~ /\brbbt$/
|
|
83
85
|
cmd_str += "'"
|
|
84
86
|
|
|
85
87
|
Log.info "Docker: \n" << cmd_str
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: rbbt-image
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.12
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Miguel Vazquez
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-06-
|
|
11
|
+
date: 2016-06-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rbbt-util
|