dockerfilemerge 0.4.5 → 0.4.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data.tar.gz.sig +2 -3
- data/lib/dockerfilemerge.rb +18 -2
- metadata +2 -2
- metadata.gz.sig +2 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 63c76356146aaf73dba1e0c93aca46ee2560c001
|
|
4
|
+
data.tar.gz: 651507190dc257065f1709d46d8df7a839091195
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 32f4f7a3cc4c18d08a092c49b41c889535dcd6fad6008c9a250fc999e132b58ff5153aa1d0e6708d064b0a56857212686cce3dd53d7ce878ac9e8f01c0d22e3e
|
|
7
|
+
data.tar.gz: c0f419523dd3829bc00e7ee253c7501cef65f192b1f6768ea72459bbc5dfe7abbbbb7bb99e4fe568af23d59e58eda9f5e182d50e5287de9b537e081dc4ee4565
|
checksums.yaml.gz.sig
CHANGED
|
Binary file
|
data.tar.gz.sig
CHANGED
|
@@ -1,3 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
!!�� ۽bQ�CjŨ��p�k���#�;K��
|
|
1
|
+
4� ���G��L�b���Cy�d�pω�wr�} m�C�s\��?q^*腱�7_.�
|
|
2
|
+
@~Q�NO�F���@��j�ml�����qԭ��,N2��#F�#��c˂y���
|
data/lib/dockerfilemerge.rb
CHANGED
|
@@ -14,6 +14,8 @@ class DockerfileMerge
|
|
|
14
14
|
s, type = RXFHelper.read(raw_s)
|
|
15
15
|
|
|
16
16
|
patterns = [
|
|
17
|
+
[:root, /^\s*ADD\s+(?<add>.*)/, :add],
|
|
18
|
+
[:root, /^\s*COPY\s+(?<copy>.*)/, :copy],
|
|
17
19
|
[:root, /FROM\s+(?<from>.*)/, :from],
|
|
18
20
|
[:root, /INCLUDE\s*(?<path>.*)?/, :include],
|
|
19
21
|
[:include, /(?<path>.*)/, :dockerfile],
|
|
@@ -45,15 +47,29 @@ class DockerfileMerge
|
|
|
45
47
|
line = r.first
|
|
46
48
|
|
|
47
49
|
case label
|
|
48
|
-
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
when :add
|
|
49
53
|
|
|
50
54
|
lines << line
|
|
51
|
-
lines << '' if r.length > 1
|
|
55
|
+
lines << ' ' + r[1..-1].join("\n ").rstrip if r.length > 1
|
|
52
56
|
|
|
53
57
|
when :comment
|
|
54
58
|
|
|
55
59
|
lines << line
|
|
56
60
|
lines << '' if r.length > 1
|
|
61
|
+
|
|
62
|
+
|
|
63
|
+
when :copy
|
|
64
|
+
|
|
65
|
+
lines << line
|
|
66
|
+
lines << ' ' + r[1..-1].join("\n ").rstrip if r.length > 1
|
|
67
|
+
|
|
68
|
+
when :from
|
|
69
|
+
|
|
70
|
+
lines << line
|
|
71
|
+
lines << '' if r.length > 1
|
|
72
|
+
|
|
57
73
|
|
|
58
74
|
when :include
|
|
59
75
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dockerfilemerge
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.6
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- James Robertson
|
|
@@ -31,7 +31,7 @@ cert_chain:
|
|
|
31
31
|
WHpJ21HYl4KWG8TISerrdwpQAZ5dhV2Yy/4q0MWSnDcMRSYdRAixOcdYW+U+R8cz
|
|
32
32
|
pf2JrQZNdYZXIg==
|
|
33
33
|
-----END CERTIFICATE-----
|
|
34
|
-
date: 2015-08-
|
|
34
|
+
date: 2015-08-05 00:00:00.000000000 Z
|
|
35
35
|
dependencies:
|
|
36
36
|
- !ruby/object:Gem::Dependency
|
|
37
37
|
name: lineparser
|
metadata.gz.sig
CHANGED
|
@@ -1,4 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
�qi���Q�{�_}t���v,5�:�!zR �Z�:��8U@`�
|
|
4
|
-
n3����ר��haۭ�-_X
|
|
1
|
+
o=�t�" �bd\�>��d)�4WK^�4d���=�)Rc���/>��η1 ��*��P���2��=���*�@S$�o��dѓ�
|
|
2
|
+
5v7�P��}8�$���pC��f ��_��4�ٓ8��8��� Xy�P"��]7t�h�!�z�*Pu�J�^1�5L<��g qs�i���x�r;��J��~��`�7q*MHh �!��VVy1����2�-�9�`�!�!
|