avmtrf1-tools 0.39.4 → 0.39.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avmtrf1/docker/image.rb +1 -1
  3. data/lib/avmtrf1/php/docker_images/base.rb +16 -0
  4. data/lib/avmtrf1/php/docker_images/v5.rb +30 -4
  5. data/lib/avmtrf1/tools/msgraph/token_retrieve.rb +1 -1
  6. data/lib/avmtrf1/tools/version.rb +1 -1
  7. data/template/avmtrf1/php/docker_images/base/Dockerfile.template +10 -7
  8. metadata +26 -21
  9. data/lib/avmtrf1/template.rb +0 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9471eaaba8226d0e2d5eb17d3c64bcb0ff839c2c7fd2cb608c250d71ff376f01
4
- data.tar.gz: adf079fe1af2f55ea7cdb7f2267ae831b37b248a9559aeb2e016ac60fc45d091
3
+ metadata.gz: ac0a64d3ed7f56d7527f21bd3d827e504623e49dfc7beb4d0584faa538a33e26
4
+ data.tar.gz: d743696b387e4bef1c0799786e84d1034eb89eb539b9bc0b4c858970eb7851db
5
5
  SHA512:
6
- metadata.gz: 8f20b5ae6d481bf1661fa0782522009374115c514fc47f6e0c2a167948eb9b38ef86798d4c077cfc76ae8fcafae3dc3bfd94c8601d76e61430b629411962a4d9
7
- data.tar.gz: 3d0a131de207ed979d9932361cb76efd8c4418bfd38c954711cf4766a70710ed3b485aecf71dca33933dd9406d8c4ff9fa2597671351a534f01bd1490c09414c
6
+ metadata.gz: 79f00f9a091a4a6392d296daaf0f3929d4e72b75d61f156a9d85fbaed0aa20a3768e178df4d9dcfdec01e29eb467e21feb0ee9b53f40bba7f8c58b54e080a654
7
+ data.tar.gz: 39ba20d1d841d414b791354ff364d638ed231806db5dfd32b4d6b5faf9f37048d7594d94637f0ab333a0c92895335303f95f50776efdd833cd42c62681c5e14b
data/lib/avmtrf1/docker/image.rb CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  require 'eac_ruby_utils/core_ext'
4
4
  require 'avm/docker/image'
5
- require 'avmtrf1/template'
5
+ require 'eac_templates/sources/from_all_gems'
6
6
 
7
7
  module Avmtrf1
8
8
  module Docker
data/lib/avmtrf1/php/docker_images/base.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
data/lib/avmtrf1/php/docker_images/v5.rb CHANGED
@@ -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
- RUN docker-php-ext-install mcrypt
15
+ RUN docker-php-ext-install mcrypt
12
16
  CODE
13
- XDEBUG_PECL_PACKAGE = 'xdebug-2.5.5'
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
- def xdebug_pecl_package
20
- XDEBUG_PECL_PACKAGE
44
+ # @return [String]
45
+ def xdebug_install
46
+ XDEBUG_INSTALL
21
47
  end
22
48
  end
23
49
  end
data/lib/avmtrf1/tools/msgraph/token_retrieve.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  require 'eac_rest/api'
4
4
  require 'eac_ruby_utils/core_ext'
5
5
  require 'eac_ruby_utils/fs/temp'
6
- require 'avmtrf1/template'
6
+ require 'eac_templates/sources/from_all_gems'
7
7
 
8
8
  module Avmtrf1
9
9
  module Tools
data/lib/avmtrf1/tools/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avmtrf1
4
4
  module Tools
5
- VERSION = '0.39.4'
5
+ VERSION = '0.39.5'
6
6
  end
7
7
  end
data/template/avmtrf1/php/docker_images/base/Dockerfile.template CHANGED
@@ -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
- RUN pecl install %%XDEBUG_PECL_PACKAGE%%
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 wget libaio1
73
- RUN wget -qO- 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
74
- RUN wget -qO- 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
75
- RUN wget -qO- 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
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 wget -O - "https://www.php.net/distributions/php-$PHP_VERSION.tar.gz" | \
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 wget -qO- https://codeload.github.com/esquilo-azul/eac-bash-lib/tar.gz/refs/tags/v0.17.1 \
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
4
+ version: 0.39.5
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-01-31 00:00:00.000000000 Z
11
+ date: 2023-06-19 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.5'
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.5'
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.13'
33
+ version: '0.18'
34
34
  - - ">="
35
35
  - !ruby/object:Gem::Version
36
- version: 0.13.1
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.13'
43
+ version: '0.18'
44
44
  - - ">="
45
45
  - !ruby/object:Gem::Version
46
- version: 0.13.1
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.145'
53
+ version: '0.151'
54
54
  - - ">="
55
55
  - !ruby/object:Gem::Version
56
- version: 0.145.1
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.145'
63
+ version: '0.151'
64
64
  - - ">="
65
65
  - !ruby/object:Gem::Version
66
- version: 0.145.1
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.7'
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.7'
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.14'
107
+ version: '1.15'
102
108
  - - ">="
103
109
  - !ruby/object:Gem::Version
104
- version: 1.14.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.14'
117
+ version: '1.15'
112
118
  - - ">="
113
119
  - !ruby/object:Gem::Version
114
- version: 1.14.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.9'
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.9'
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
data/lib/avmtrf1/template.rb DELETED
@@ -1,6 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- require 'eac_templates/searcher'
4
-
5
- ::EacTemplates::Searcher.default.included_paths <<
6
- ::File.expand_path('../../template', __dir__)