miniexec 0.0.8 → 0.0.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/miniexec.rb +4 -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: f159f73abf46bbc302ba16f34e5f3ec7eac0fe530e57e06e24e3504f198f2027
|
4
|
+
data.tar.gz: 41bd239c0271b589f448de12318397324f2e6ab67e6274caaa79405668119ef7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a86c5c2d96807c1572d2a78a6799e05694987f2bee706fb7b9822a6ee0b6d5481bcc43e4aa3a668957b476a30d6dfb5f054aa37956948cd3e9b8d2dac336af4d
|
7
|
+
data.tar.gz: 8722200cb309d02e28272ef2977464c1870980442deafacaa0dbd55842eb0fcfab77c0e33bf86bbd2ab18b7c39d48cf67fedbac3225b0ad84848436f36fbfffc
|
data/lib/miniexec.rb
CHANGED
@@ -38,7 +38,10 @@ class MiniExec
|
|
38
38
|
@image = set_job_image
|
39
39
|
@script = compile_script
|
40
40
|
@binds = binds
|
41
|
-
@env =
|
41
|
+
@env = {}
|
42
|
+
@env.merge! env
|
43
|
+
@env.merge! gitlab_env
|
44
|
+
@env.merge! variables
|
42
45
|
configure_logger
|
43
46
|
Docker.options[:read_timeout] = 6000
|
44
47
|
Docker.url = docker_url if docker_url
|