dapp 0.12.6 → 0.12.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dapp/dimg/build/stage/artifact_default.rb +1 -1
- data/lib/dapp/dimg/dimg.rb +12 -1
- data/lib/dapp/dimg/dimg/path.rb +5 -1
- data/lib/dapp/version.rb +2 -2
- 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: 0ae33ea300290cdf11a46bab9e8432d2c71f3433
|
4
|
+
data.tar.gz: 32c5e1589de895853f62dfbd9d62bd811264662f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0096daae7f8e449896e3d498f93c89cb694df5ccd6c3693d39744bfb5f3bbfa962fac02177999101066ffa37eccb6887ee2737968e3b7e8caa3eb788d04d521d
|
7
|
+
data.tar.gz: 1977267b13a8c8035877c3c204491f0ec8f5841cbc360c321b44baebac0dc5212e4709532dc5d03b67c05e9d28fd974893cdf3775127c00676c58ac46a9a3bbd
|
@@ -17,7 +17,7 @@ module Dapp
|
|
17
17
|
group = artifact[:options][:group]
|
18
18
|
to = artifact[:options][:to]
|
19
19
|
|
20
|
-
command = safe_cp(cwd, artifact_dimg.container_tmp_path(artifact_name).to_s,
|
20
|
+
command = safe_cp(cwd, artifact_dimg.container_tmp_path(artifact_name).to_s, nil, nil, include_paths, exclude_paths)
|
21
21
|
run_artifact_dimg(artifact_dimg, artifact_name, command)
|
22
22
|
|
23
23
|
command = safe_cp(dimg.container_tmp_path('artifact', artifact_name).to_s, to, owner, group, include_paths, exclude_paths)
|
data/lib/dapp/dimg/dimg.rb
CHANGED
@@ -163,7 +163,18 @@ module Dapp
|
|
163
163
|
end
|
164
164
|
|
165
165
|
def cleanup_tmp
|
166
|
-
|
166
|
+
# В tmp-директории могли остаться файлы, владельцами которых мы не являемся.
|
167
|
+
# Такие файлы могут попасть туда при экспорте файлов артефакта.
|
168
|
+
# Чтобы от них избавиться — запускаем docker-контейнер под root-пользователем
|
169
|
+
# и удаляем примонтированную tmp-директорию.
|
170
|
+
cmd = "".tap do |cmd|
|
171
|
+
cmd << "docker run --rm"
|
172
|
+
cmd << " --volume #{tmp_base_dir}:#{tmp_base_dir}"
|
173
|
+
cmd << " ubuntu:16.04"
|
174
|
+
cmd << " rm -rf #{tmp_path}"
|
175
|
+
end
|
176
|
+
dapp.shellout! cmd
|
177
|
+
|
167
178
|
artifacts.each(&:cleanup_tmp)
|
168
179
|
end
|
169
180
|
|
data/lib/dapp/dimg/dimg/path.rb
CHANGED
@@ -6,8 +6,12 @@ module Dapp
|
|
6
6
|
make_path(dapp.path, *path).expand_path
|
7
7
|
end
|
8
8
|
|
9
|
+
def tmp_base_dir
|
10
|
+
File.expand_path(dapp.options[:tmp_dir_prefix] || '/tmp')
|
11
|
+
end
|
12
|
+
|
9
13
|
def tmp_path(*path)
|
10
|
-
@tmp_path ||= Dir.mktmpdir('dapp-',
|
14
|
+
@tmp_path ||= Dir.mktmpdir('dapp-', tmp_base_dir)
|
11
15
|
make_path(@tmp_path, *path).expand_path.tap { |p| p.parent.mkpath }
|
12
16
|
end
|
13
17
|
|
data/lib/dapp/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dapp
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.12.
|
4
|
+
version: 0.12.7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dmitry Stolyarov
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-05-
|
11
|
+
date: 2017-05-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mixlib-shellout
|