avmtrf1-tools 0.39.1 → 0.39.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/avmtrf1/docker/image.rb +3 -3
- data/lib/avmtrf1/docker/image_runner.rb +6 -6
- data/lib/avmtrf1/git/cached_repository.rb +2 -2
- data/lib/avmtrf1/git/push_large.rb +2 -2
- data/lib/avmtrf1/patches/avm/{launcher/git → git/launcher}/base.rb +5 -5
- data/lib/avmtrf1/patches/avm/{launcher.rb → git/launcher.rb} +0 -0
- data/lib/avmtrf1/php/docker_images/base.rb +5 -0
- data/lib/avmtrf1/tools/runner/php/docker.rb +2 -2
- data/lib/avmtrf1/tools/version.rb +1 -1
- data/template/avmtrf1/node_js/docker_image/Dockerfile.template +1 -1
- data/template/avmtrf1/php/docker_images/base/Dockerfile.template +1 -1
- metadata +18 -25
- data/lib/avmtrf1/patches/avm/launcher/git.rb +0 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f18fafef35d11fbe741daa7a8947becf6740c513250ffcc40df6c107429d22cc
|
4
|
+
data.tar.gz: 5f561f1f0414b3c7ce8bea5ea7e70aee0c2f637ff9badb670f977ed9b1405932
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 14726142418dea3e9388c0060be2673b83f366c0c0f9436c09cb19be46a9313b204e83bfdc8aa832696628ef06e0b50cbf5c971cd4111c17e67553696ff93cd9
|
7
|
+
data.tar.gz: 176d11774e1a5e0012d040c4ee4c553d42c92cb3dd9c5a5475bcfa68620d50b2adf543323fc36455b595c29be5432cde86c4dcf5e97728e72134aecdc19cc4b8
|
data/lib/avmtrf1/docker/image.rb
CHANGED
@@ -9,14 +9,14 @@ module Avmtrf1
|
|
9
9
|
class Image < ::Avm::Docker::Image
|
10
10
|
enable_simple_cache
|
11
11
|
|
12
|
-
common_constructor :registry, :
|
12
|
+
common_constructor :registry, :platform_version
|
13
13
|
|
14
|
-
def
|
14
|
+
def platform_stereotype_tag
|
15
15
|
self.class.name.split('::')[-2].underscore.dasherize
|
16
16
|
end
|
17
17
|
|
18
18
|
def stereotype_tag
|
19
|
-
"#{
|
19
|
+
"#{platform_stereotype_tag}-#{platform_version}"
|
20
20
|
end
|
21
21
|
|
22
22
|
def generator_version
|
@@ -60,22 +60,22 @@ module Avmtrf1
|
|
60
60
|
::EacDocker::Registry.new(registry_name)
|
61
61
|
end
|
62
62
|
|
63
|
-
def build_image(
|
64
|
-
r = docker_image_class(
|
63
|
+
def build_image(platform_version)
|
64
|
+
r = docker_image_class(platform_version).new(registry, platform_version)
|
65
65
|
r.send('version=', !parsed.no_version?)
|
66
66
|
r.snapshot = !parsed.no_snapshot?
|
67
67
|
r
|
68
68
|
end
|
69
69
|
|
70
70
|
def default_versions_config_key
|
71
|
-
"#{
|
71
|
+
"#{platform_name.underscore}.default_versions"
|
72
72
|
end
|
73
73
|
|
74
|
-
def docker_image_class(
|
75
|
-
"Avmtrf1::#{
|
74
|
+
def docker_image_class(_platform_version)
|
75
|
+
"Avmtrf1::#{platform_name}::DockerImage".constantize
|
76
76
|
end
|
77
77
|
|
78
|
-
def
|
78
|
+
def platform_name
|
79
79
|
self.class.name.split('::')[-2]
|
80
80
|
end
|
81
81
|
end
|
@@ -1,10 +1,10 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'avm/launcher/
|
3
|
+
require 'avm/git/launcher/base'
|
4
4
|
|
5
5
|
module Avmtrf1
|
6
6
|
module Git
|
7
|
-
class CachedRepository < ::Avm::Launcher::
|
7
|
+
class CachedRepository < ::Avm::Git::Launcher::Base
|
8
8
|
attr_reader :url
|
9
9
|
|
10
10
|
def initialize(url)
|
@@ -5,7 +5,7 @@ require 'ostruct'
|
|
5
5
|
require 'eac_ruby_utils/patches/module/speaker'
|
6
6
|
require 'eac_ruby_utils/require_sub'
|
7
7
|
require 'eac_ruby_utils/simple_cache'
|
8
|
-
require 'avmtrf1/patches/avm/launcher/
|
8
|
+
require 'avmtrf1/patches/avm/git/launcher/base'
|
9
9
|
|
10
10
|
module Avmtrf1
|
11
11
|
module Git
|
@@ -18,7 +18,7 @@ module Avmtrf1
|
|
18
18
|
attr_reader :git, :remote_name, :source_ref, :target_ref, :last_pushed_revision
|
19
19
|
|
20
20
|
def initialize(git_local_path, remote_name, source_ref, target_ref)
|
21
|
-
@git = ::Avm::Launcher::
|
21
|
+
@git = ::Avm::Git::Launcher::Base.new(git_local_path)
|
22
22
|
@remote_name = remote_name
|
23
23
|
@source_ref = source_ref
|
24
24
|
@target_ref = target_ref
|
@@ -1,14 +1,14 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'avm/launcher/
|
3
|
+
require 'avm/git/launcher/base'
|
4
4
|
require 'eac_ruby_utils/patch'
|
5
5
|
require 'active_support/concern'
|
6
6
|
|
7
7
|
module Avmtrf1
|
8
8
|
module Patches
|
9
9
|
module Avm
|
10
|
-
module
|
11
|
-
module
|
10
|
+
module Git
|
11
|
+
module Launcher
|
12
12
|
module Base
|
13
13
|
extend ActiveSupport::Concern
|
14
14
|
|
@@ -41,6 +41,6 @@ module Avmtrf1
|
|
41
41
|
end
|
42
42
|
|
43
43
|
::EacRubyUtils.patch(
|
44
|
-
::Avm::Launcher::
|
45
|
-
::Avmtrf1::Patches::Avm::Launcher::
|
44
|
+
::Avm::Git::Launcher::Base,
|
45
|
+
::Avmtrf1::Patches::Avm::Git::Launcher::Base
|
46
46
|
)
|
File without changes
|
@@ -13,6 +13,11 @@ module Avmtrf1
|
|
13
13
|
|
14
14
|
GD_OPTIONS = %w[--with-gd --with-webp-dir --with-jpeg-dir --with-png-dir --with-zlib-dir
|
15
15
|
--with-xpm-dir --with-freetype-dir].freeze
|
16
|
+
PLATFORM_STEREOTYPE_TAG = 'php'
|
17
|
+
|
18
|
+
def platform_stereotype_tag
|
19
|
+
PLATFORM_STEREOTYPE_TAG
|
20
|
+
end
|
16
21
|
|
17
22
|
def write_in_provide_dir
|
18
23
|
::Avmtrf1::Php::DockerImages::Base.template.apply(self, provide_dir)
|
@@ -10,8 +10,8 @@ module Avmtrf1
|
|
10
10
|
class Runner
|
11
11
|
class Php
|
12
12
|
class Docker < ::Avmtrf1::Docker::ImageRunner
|
13
|
-
def docker_image_class(
|
14
|
-
::Avmtrf1::Php::DockerImages::Factory.new(
|
13
|
+
def docker_image_class(platform_version)
|
14
|
+
::Avmtrf1::Php::DockerImages::Factory.new(platform_version).result
|
15
15
|
end
|
16
16
|
end
|
17
17
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: avmtrf1-tools
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.39.
|
4
|
+
version: 0.39.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Eduardo H. Bogoni
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-10-
|
11
|
+
date: 2022-10-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aranha-selenium
|
@@ -16,54 +16,54 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '0.
|
19
|
+
version: '0.4'
|
20
20
|
- - ">="
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: 0.
|
22
|
+
version: 0.4.2
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
26
26
|
requirements:
|
27
27
|
- - "~>"
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: '0.
|
29
|
+
version: '0.4'
|
30
30
|
- - ">="
|
31
31
|
- !ruby/object:Gem::Version
|
32
|
-
version: 0.
|
32
|
+
version: 0.4.2
|
33
33
|
- !ruby/object:Gem::Dependency
|
34
34
|
name: avm-eac_webapp_base0
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|
36
36
|
requirements:
|
37
37
|
- - "~>"
|
38
38
|
- !ruby/object:Gem::Version
|
39
|
-
version: '0.
|
39
|
+
version: '0.9'
|
40
40
|
- - ">="
|
41
41
|
- !ruby/object:Gem::Version
|
42
|
-
version: 0.
|
42
|
+
version: 0.9.2
|
43
43
|
type: :runtime
|
44
44
|
prerelease: false
|
45
45
|
version_requirements: !ruby/object:Gem::Requirement
|
46
46
|
requirements:
|
47
47
|
- - "~>"
|
48
48
|
- !ruby/object:Gem::Version
|
49
|
-
version: '0.
|
49
|
+
version: '0.9'
|
50
50
|
- - ">="
|
51
51
|
- !ruby/object:Gem::Version
|
52
|
-
version: 0.
|
52
|
+
version: 0.9.2
|
53
53
|
- !ruby/object:Gem::Dependency
|
54
54
|
name: avm-tools
|
55
55
|
requirement: !ruby/object:Gem::Requirement
|
56
56
|
requirements:
|
57
57
|
- - "~>"
|
58
58
|
- !ruby/object:Gem::Version
|
59
|
-
version: '0.
|
59
|
+
version: '0.141'
|
60
60
|
type: :runtime
|
61
61
|
prerelease: false
|
62
62
|
version_requirements: !ruby/object:Gem::Requirement
|
63
63
|
requirements:
|
64
64
|
- - "~>"
|
65
65
|
- !ruby/object:Gem::Version
|
66
|
-
version: '0.
|
66
|
+
version: '0.141'
|
67
67
|
- !ruby/object:Gem::Dependency
|
68
68
|
name: eac_rest
|
69
69
|
requirement: !ruby/object:Gem::Requirement
|
@@ -107,7 +107,7 @@ dependencies:
|
|
107
107
|
version: '1.13'
|
108
108
|
- - ">="
|
109
109
|
- !ruby/object:Gem::Version
|
110
|
-
version: 1.13.
|
110
|
+
version: 1.13.8
|
111
111
|
type: :runtime
|
112
112
|
prerelease: false
|
113
113
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -117,7 +117,7 @@ dependencies:
|
|
117
117
|
version: '1.13'
|
118
118
|
- - ">="
|
119
119
|
- !ruby/object:Gem::Version
|
120
|
-
version: 1.13.
|
120
|
+
version: 1.13.8
|
121
121
|
- !ruby/object:Gem::Dependency
|
122
122
|
name: recursive-open-struct
|
123
123
|
requirement: !ruby/object:Gem::Requirement
|
@@ -144,20 +144,14 @@ dependencies:
|
|
144
144
|
requirements:
|
145
145
|
- - "~>"
|
146
146
|
- !ruby/object:Gem::Version
|
147
|
-
version: '2.
|
148
|
-
- - ">="
|
149
|
-
- !ruby/object:Gem::Version
|
150
|
-
version: 2.8.3
|
147
|
+
version: '2.9'
|
151
148
|
type: :runtime
|
152
149
|
prerelease: false
|
153
150
|
version_requirements: !ruby/object:Gem::Requirement
|
154
151
|
requirements:
|
155
152
|
- - "~>"
|
156
153
|
- !ruby/object:Gem::Version
|
157
|
-
version: '2.
|
158
|
-
- - ">="
|
159
|
-
- !ruby/object:Gem::Version
|
160
|
-
version: 2.8.3
|
154
|
+
version: '2.9'
|
161
155
|
- !ruby/object:Gem::Dependency
|
162
156
|
name: eac_ruby_gem_support
|
163
157
|
requirement: !ruby/object:Gem::Requirement
|
@@ -291,9 +285,8 @@ files:
|
|
291
285
|
- lib/avmtrf1/patches/avm/git.rb
|
292
286
|
- lib/avmtrf1/patches/avm/git/issue.rb
|
293
287
|
- lib/avmtrf1/patches/avm/git/issue/complete.rb
|
294
|
-
- lib/avmtrf1/patches/avm/launcher.rb
|
295
|
-
- lib/avmtrf1/patches/avm/launcher/
|
296
|
-
- lib/avmtrf1/patches/avm/launcher/git/base.rb
|
288
|
+
- lib/avmtrf1/patches/avm/git/launcher.rb
|
289
|
+
- lib/avmtrf1/patches/avm/git/launcher/base.rb
|
297
290
|
- lib/avmtrf1/patches/inifile.rb
|
298
291
|
- lib/avmtrf1/php.rb
|
299
292
|
- lib/avmtrf1/php/docker_images.rb
|