avmtrf1-tools 0.39.4 → 0.39.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +0 -2
- data/lib/avmtrf1/docker/image.rb +1 -1
- data/lib/avmtrf1/php/docker_images/base.rb +16 -0
- data/lib/avmtrf1/php/docker_images/v5.rb +30 -4
- data/lib/avmtrf1/red/helper.rb +5 -20
- data/lib/avmtrf1/red/profile.rb +5 -18
- data/lib/avmtrf1/tools/msgraph/token_retrieve.rb +1 -1
- data/lib/avmtrf1/tools/version.rb +1 -1
- data/template/avmtrf1/php/docker_images/base/Dockerfile.template +10 -7
- metadata +26 -21
- data/lib/avmtrf1/template.rb +0 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f3f26b0210df64425354daf7e5d9ac10dcb0aecbb51b00f9079ac5dc1ff5e8e2
|
4
|
+
data.tar.gz: 7a1ee3b449c30d1ad515d28359aaf8b8a15442bb995a6797a12bce30eba61a25
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 11a4f7ec4a34de508424eceb46f9d3358d3b9e11e1b5f0fcf9375169dc6df8a50193fdbe9891069b0b5e0adb7fa88181a0f04246774afa88e47dd19b5d96645c
|
7
|
+
data.tar.gz: 3607982ce6d014d551c92a323b308143b6b02e473fbb03dddf8c8a8768aeafade90a5a6dbae49cecef16c5037e6555651383c2b9c3a8893e1d505d7a6e3d57af
|
data/Gemfile
CHANGED
data/lib/avmtrf1/docker/image.rb
CHANGED
@@ -11,6 +11,7 @@ module Avmtrf1
|
|
11
11
|
enable_abstract_methods
|
12
12
|
abstract_methods :mcrypt_install, :xdebug_pecl_package
|
13
13
|
|
14
|
+
DEFAULT_BEFORE_CODE = ''
|
14
15
|
GD_OPTIONS = %w[--with-gd --with-webp-dir --with-jpeg-dir --with-png-dir --with-zlib-dir
|
15
16
|
--with-xpm-dir --with-freetype-dir].freeze
|
16
17
|
PLATFORM_STEREOTYPE_TAG = 'php'
|
@@ -22,6 +23,16 @@ module Avmtrf1
|
|
22
23
|
end
|
23
24
|
end
|
24
25
|
|
26
|
+
# @return [String]
|
27
|
+
def before_code
|
28
|
+
DEFAULT_BEFORE_CODE
|
29
|
+
end
|
30
|
+
|
31
|
+
# @return [String]
|
32
|
+
def php_dist_curl_args
|
33
|
+
'-sS "https://www.php.net/distributions/php-$PHP_VERSION.tar.gz"'
|
34
|
+
end
|
35
|
+
|
25
36
|
def platform_stereotype_tag
|
26
37
|
PLATFORM_STEREOTYPE_TAG
|
27
38
|
end
|
@@ -33,6 +44,11 @@ module Avmtrf1
|
|
33
44
|
def gd_options
|
34
45
|
GD_OPTIONS.join(' ')
|
35
46
|
end
|
47
|
+
|
48
|
+
# @return [String]
|
49
|
+
def xdebug_install
|
50
|
+
"RUN pecl install #{xdebug_pecl_package}"
|
51
|
+
end
|
36
52
|
end
|
37
53
|
end
|
38
54
|
end
|
@@ -7,17 +7,43 @@ module Avmtrf1
|
|
7
7
|
module Php
|
8
8
|
module DockerImages
|
9
9
|
class V5 < ::Avmtrf1::Php::DockerImages::Base
|
10
|
+
BEFORE_CODE = <<CODE
|
11
|
+
RUN echo 'deb http://security.debian.org/debian-security stable-security/updates main' > /etc/apt/sources.list
|
12
|
+
RUN echo 'deb http://archive.debian.org/debian stretch main' >> /etc/apt/sources.list
|
13
|
+
CODE
|
10
14
|
MCRYPT_INSTALL = <<~CODE
|
11
|
-
|
15
|
+
RUN docker-php-ext-install mcrypt
|
12
16
|
CODE
|
13
|
-
|
17
|
+
XDEBUG_INSTALL = <<CODE
|
18
|
+
RUN apt-get install -y git
|
19
|
+
RUN cd /tmp && \
|
20
|
+
git clone https://github.com/xdebug/xdebug.git && \
|
21
|
+
cd xdebug && \
|
22
|
+
git checkout XDEBUG_2_5_5 && \
|
23
|
+
phpize && \
|
24
|
+
./configure --enable-xdebug && \
|
25
|
+
make && \
|
26
|
+
make install && \
|
27
|
+
rm -rf /tmp/xdebug
|
28
|
+
CODE
|
29
|
+
|
30
|
+
# @return [String]
|
31
|
+
def before_code
|
32
|
+
BEFORE_CODE
|
33
|
+
end
|
34
|
+
|
35
|
+
# @return [String]
|
36
|
+
def php_dist_curl_args
|
37
|
+
"--insecure #{super}"
|
38
|
+
end
|
14
39
|
|
15
40
|
def mcrypt_install
|
16
41
|
MCRYPT_INSTALL
|
17
42
|
end
|
18
43
|
|
19
|
-
|
20
|
-
|
44
|
+
# @return [String]
|
45
|
+
def xdebug_install
|
46
|
+
XDEBUG_INSTALL
|
21
47
|
end
|
22
48
|
end
|
23
49
|
end
|
data/lib/avmtrf1/red/helper.rb
CHANGED
@@ -1,36 +1,21 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require '
|
4
|
-
require '
|
5
|
-
require 'eac_ruby_utils/patches/module/speaker'
|
3
|
+
require 'eac_envs/http/request'
|
4
|
+
require 'eac_ruby_utils/core_ext'
|
6
5
|
require 'erb'
|
7
|
-
require 'httpclient'
|
8
6
|
require 'nokogiri'
|
9
7
|
|
10
8
|
module Avmtrf1
|
11
9
|
module Red
|
12
10
|
module Helper
|
13
|
-
|
14
|
-
|
15
|
-
included do
|
11
|
+
common_concern do
|
16
12
|
enable_speaker
|
17
13
|
end
|
18
14
|
|
19
|
-
def http_client
|
20
|
-
@http_client ||= ::HTTPClient.new
|
21
|
-
end
|
22
|
-
|
23
|
-
def check_request_result(url, result)
|
24
|
-
return if result.status == 200
|
25
|
-
|
26
|
-
raise "#{url} returned #{result.status}\n#{result.body}"
|
27
|
-
end
|
28
|
-
|
29
15
|
def post(url, *post_args)
|
30
16
|
infom "Requesting \"#{url}\""
|
31
|
-
|
32
|
-
|
33
|
-
res.body
|
17
|
+
::EacEnvs::Http::Request.new.url(url.to_s).verb(:post).body_data(post_args.first).response
|
18
|
+
.body_str_or_raise
|
34
19
|
end
|
35
20
|
|
36
21
|
def post_xml(url_suffix, xml_body)
|
data/lib/avmtrf1/red/profile.rb
CHANGED
@@ -2,13 +2,13 @@
|
|
2
2
|
|
3
3
|
require 'avmtrf1/red/client'
|
4
4
|
require 'avmtrf1/red/helper'
|
5
|
-
require 'eac_ruby_utils/
|
5
|
+
require 'eac_ruby_utils/core_ext'
|
6
6
|
|
7
7
|
module Avmtrf1
|
8
8
|
module Red
|
9
9
|
class Profile
|
10
10
|
include ::Avmtrf1::Red::Helper
|
11
|
-
|
11
|
+
enable_simple_cache
|
12
12
|
|
13
13
|
class << self
|
14
14
|
def by_ini_profile(ini_profile)
|
@@ -19,14 +19,10 @@ module Avmtrf1
|
|
19
19
|
end
|
20
20
|
end
|
21
21
|
|
22
|
-
|
23
|
-
|
22
|
+
# @!method initialize(client, metadados)
|
24
23
|
# @param client [Avmtrf1::Red::Client]
|
25
24
|
# @param metadados [Hash]
|
26
|
-
|
27
|
-
@client = client
|
28
|
-
@metadados = metadados.dup.freeze
|
29
|
-
end
|
25
|
+
common_constructor :client, :metadados
|
30
26
|
|
31
27
|
def put_file(file_path)
|
32
28
|
auth_url = client.authorization_url
|
@@ -39,16 +35,7 @@ module Avmtrf1
|
|
39
35
|
private
|
40
36
|
|
41
37
|
def put_file_request(auth_url, file_path)
|
42
|
-
post(auth_url,
|
43
|
-
end
|
44
|
-
|
45
|
-
def put_file_args(file_path)
|
46
|
-
{
|
47
|
-
body: put_file_body(file_path),
|
48
|
-
header: {
|
49
|
-
'Content-Type' => 'multipart/form-data'
|
50
|
-
}
|
51
|
-
}
|
38
|
+
post(auth_url, put_file_body(file_path))
|
52
39
|
end
|
53
40
|
|
54
41
|
def metadados_file_path_uncached
|
@@ -1,6 +1,9 @@
|
|
1
1
|
FROM php:%%PLATFORM_VERSION%%-apache
|
2
2
|
|
3
|
+
%%BEFORE_CODE%%
|
4
|
+
|
3
5
|
# Base ubuntu
|
6
|
+
ENV DEBIAN_FRONTEND=noninteractive
|
4
7
|
RUN apt-get -y update
|
5
8
|
RUN apt-get -y dist-upgrade
|
6
9
|
|
@@ -50,7 +53,7 @@ RUN apt-get install -y libxml2-dev
|
|
50
53
|
RUN docker-php-ext-install soap
|
51
54
|
|
52
55
|
# Extensão PHP "xdebug"
|
53
|
-
|
56
|
+
%%XDEBUG_INSTALL%%
|
54
57
|
RUN docker-php-ext-enable xdebug
|
55
58
|
|
56
59
|
# Extensão PHP "xsl"
|
@@ -69,10 +72,10 @@ RUN apt-get install -y libpq-dev
|
|
69
72
|
RUN docker-php-ext-install pdo_pgsql pgsql
|
70
73
|
|
71
74
|
# Extensão PHP oci
|
72
|
-
RUN apt-get install -y libarchive-tools
|
73
|
-
RUN
|
74
|
-
RUN
|
75
|
-
RUN
|
75
|
+
RUN apt-get install -y libarchive-tools libaio1
|
76
|
+
RUN curl -sS https://raw.githubusercontent.com/caffeinalab/php-fpm-oci8/master/oracle/instantclient-basic-linux.x64-12.2.0.1.0.zip | bsdtar -xvf- -C /usr/local
|
77
|
+
RUN curl -sS https://raw.githubusercontent.com/caffeinalab/php-fpm-oci8/master/oracle/instantclient-sdk-linux.x64-12.2.0.1.0.zip | bsdtar -xvf- -C /usr/local
|
78
|
+
RUN curl -sS https://raw.githubusercontent.com/caffeinalab/php-fpm-oci8/master/oracle/instantclient-sqlplus-linux.x64-12.2.0.1.0.zip | bsdtar -xvf- -C /usr/local
|
76
79
|
RUN ln -s /usr/local/instantclient_12_2 /usr/local/instantclient
|
77
80
|
RUN ln -s /usr/local/instantclient/libclntsh.so.* /usr/local/instantclient/libclntsh.so
|
78
81
|
RUN ln -s /usr/local/instantclient/lib* /usr/lib
|
@@ -82,7 +85,7 @@ RUN docker-php-ext-install oci8
|
|
82
85
|
|
83
86
|
# Extensão PHP pdo_oci
|
84
87
|
RUN mkdir /tmp/php_source
|
85
|
-
RUN
|
88
|
+
RUN curl %%PHP_DIST_CURL_ARGS%% | \
|
86
89
|
tar -zxf - -C /tmp/php_source --strip 1
|
87
90
|
WORKDIR /tmp/php_source/ext/pdo_oci
|
88
91
|
RUN phpize
|
@@ -100,7 +103,7 @@ RUN curl -sS https://getcomposer.org/installer | \
|
|
100
103
|
# Inicializador
|
101
104
|
RUN mkdir '/aux'
|
102
105
|
RUN mkdir '/aux/eac-bash-lib'
|
103
|
-
RUN
|
106
|
+
RUN curl -sS https://codeload.github.com/esquilo-azul/eac-bash-lib/tar.gz/refs/tags/v0.17.1 \
|
104
107
|
| tar -xzf - --strip-components 1 -C '/aux/eac-bash-lib'
|
105
108
|
ADD aux '/aux'
|
106
109
|
CMD '/aux/start.sh'
|
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.6
|
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: 2023-
|
11
|
+
date: 2023-06-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aranha-selenium
|
@@ -16,68 +16,74 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '0.
|
19
|
+
version: '0.7'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: '0.
|
26
|
+
version: '0.7'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: avm-eac_webapp_base0
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: '0.
|
33
|
+
version: '0.18'
|
34
34
|
- - ">="
|
35
35
|
- !ruby/object:Gem::Version
|
36
|
-
version: 0.
|
36
|
+
version: 0.18.1
|
37
37
|
type: :runtime
|
38
38
|
prerelease: false
|
39
39
|
version_requirements: !ruby/object:Gem::Requirement
|
40
40
|
requirements:
|
41
41
|
- - "~>"
|
42
42
|
- !ruby/object:Gem::Version
|
43
|
-
version: '0.
|
43
|
+
version: '0.18'
|
44
44
|
- - ">="
|
45
45
|
- !ruby/object:Gem::Version
|
46
|
-
version: 0.
|
46
|
+
version: 0.18.1
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: avm-tools
|
49
49
|
requirement: !ruby/object:Gem::Requirement
|
50
50
|
requirements:
|
51
51
|
- - "~>"
|
52
52
|
- !ruby/object:Gem::Version
|
53
|
-
version: '0.
|
53
|
+
version: '0.151'
|
54
54
|
- - ">="
|
55
55
|
- !ruby/object:Gem::Version
|
56
|
-
version: 0.
|
56
|
+
version: 0.151.1
|
57
57
|
type: :runtime
|
58
58
|
prerelease: false
|
59
59
|
version_requirements: !ruby/object:Gem::Requirement
|
60
60
|
requirements:
|
61
61
|
- - "~>"
|
62
62
|
- !ruby/object:Gem::Version
|
63
|
-
version: '0.
|
63
|
+
version: '0.151'
|
64
64
|
- - ">="
|
65
65
|
- !ruby/object:Gem::Version
|
66
|
-
version: 0.
|
66
|
+
version: 0.151.1
|
67
67
|
- !ruby/object:Gem::Dependency
|
68
68
|
name: eac_rest
|
69
69
|
requirement: !ruby/object:Gem::Requirement
|
70
70
|
requirements:
|
71
71
|
- - "~>"
|
72
72
|
- !ruby/object:Gem::Version
|
73
|
-
version: '0.
|
73
|
+
version: '0.9'
|
74
|
+
- - ">="
|
75
|
+
- !ruby/object:Gem::Version
|
76
|
+
version: 0.9.1
|
74
77
|
type: :runtime
|
75
78
|
prerelease: false
|
76
79
|
version_requirements: !ruby/object:Gem::Requirement
|
77
80
|
requirements:
|
78
81
|
- - "~>"
|
79
82
|
- !ruby/object:Gem::Version
|
80
|
-
version: '0.
|
83
|
+
version: '0.9'
|
84
|
+
- - ">="
|
85
|
+
- !ruby/object:Gem::Version
|
86
|
+
version: 0.9.1
|
81
87
|
- !ruby/object:Gem::Dependency
|
82
88
|
name: inifile
|
83
89
|
requirement: !ruby/object:Gem::Requirement
|
@@ -98,20 +104,20 @@ dependencies:
|
|
98
104
|
requirements:
|
99
105
|
- - "~>"
|
100
106
|
- !ruby/object:Gem::Version
|
101
|
-
version: '1.
|
107
|
+
version: '1.15'
|
102
108
|
- - ">="
|
103
109
|
- !ruby/object:Gem::Version
|
104
|
-
version: 1.
|
110
|
+
version: 1.15.2
|
105
111
|
type: :runtime
|
106
112
|
prerelease: false
|
107
113
|
version_requirements: !ruby/object:Gem::Requirement
|
108
114
|
requirements:
|
109
115
|
- - "~>"
|
110
116
|
- !ruby/object:Gem::Version
|
111
|
-
version: '1.
|
117
|
+
version: '1.15'
|
112
118
|
- - ">="
|
113
119
|
- !ruby/object:Gem::Version
|
114
|
-
version: 1.
|
120
|
+
version: 1.15.2
|
115
121
|
- !ruby/object:Gem::Dependency
|
116
122
|
name: recursive-open-struct
|
117
123
|
requirement: !ruby/object:Gem::Requirement
|
@@ -138,14 +144,14 @@ dependencies:
|
|
138
144
|
requirements:
|
139
145
|
- - "~>"
|
140
146
|
- !ruby/object:Gem::Version
|
141
|
-
version: '2.
|
147
|
+
version: '2.10'
|
142
148
|
type: :runtime
|
143
149
|
prerelease: false
|
144
150
|
version_requirements: !ruby/object:Gem::Requirement
|
145
151
|
requirements:
|
146
152
|
- - "~>"
|
147
153
|
- !ruby/object:Gem::Version
|
148
|
-
version: '2.
|
154
|
+
version: '2.10'
|
149
155
|
- !ruby/object:Gem::Dependency
|
150
156
|
name: eac_ruby_gem_support
|
151
157
|
requirement: !ruby/object:Gem::Requirement
|
@@ -313,7 +319,6 @@ files:
|
|
313
319
|
- lib/avmtrf1/ruby/gems.rb
|
314
320
|
- lib/avmtrf1/ruby/gems/dependency.rb
|
315
321
|
- lib/avmtrf1/ruby/gems/not_found_error.rb
|
316
|
-
- lib/avmtrf1/template.rb
|
317
322
|
- lib/avmtrf1/tools.rb
|
318
323
|
- lib/avmtrf1/tools/application.rb
|
319
324
|
- lib/avmtrf1/tools/core_ext.rb
|