pd1_tools 0.44.0 → 0.45.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (28) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avmtrf1/tools/runner/php/docker.rb +2 -2
  3. data/lib/{avmtrf1 → pd1_tools}/php/docker_images/base.rb +2 -2
  4. data/lib/{avmtrf1 → pd1_tools}/php/docker_images/factory.rb +9 -9
  5. data/lib/{avmtrf1 → pd1_tools}/php/docker_images/v5.rb +3 -3
  6. data/lib/{avmtrf1 → pd1_tools}/php/docker_images/v7.rb +3 -3
  7. data/lib/{avmtrf1 → pd1_tools}/php/docker_images/v7_v4.rb +3 -3
  8. data/lib/{avmtrf1 → pd1_tools}/php/docker_images/v8.rb +3 -3
  9. data/lib/{avmtrf1 → pd1_tools}/php/docker_images.rb +1 -1
  10. data/lib/pd1_tools/version.rb +1 -1
  11. data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/Dockerfile.template +3 -0
  12. data/template/pd1_tools/php/docker_images/base/aux/init.sh +13 -0
  13. data/template/{avmtrf1/php/docker_images/base/aux/setup_apache_site.sh → pd1_tools/php/docker_images/base/aux/setup_apache_modules.sh} +1 -2
  14. data/template/pd1_tools/php/docker_images/base/aux/setup_apache_sites.sh +22 -0
  15. data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/aux/start.sh +2 -1
  16. data/template/pd1_tools/php/docker_images/base/aux/templates/apache_site_ssl.conf +16 -0
  17. data/template/{avmtrf1/php/docker_images/base/aux/init.sh → pd1_tools/php/docker_images/base/aux/variables.sh} +4 -0
  18. metadata +26 -23
  19. /data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/aux/apache_foreground.sh +0 -0
  20. /data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/aux/apache_user.sh +0 -0
  21. /data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/aux/app_user_run.sh +0 -0
  22. /data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/aux/config_banner.sh +0 -0
  23. /data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/aux/laravel.sh +0 -0
  24. /data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/aux/lib.sh +0 -0
  25. /data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/aux/pear.sh +0 -0
  26. /data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/aux/php_composer.sh +0 -0
  27. /data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/aux/php_values.sh +0 -0
  28. /data/template/{avmtrf1/php/docker_images/base/aux/templates/apache_site.conf → pd1_tools/php/docker_images/base/aux/templates/apache_site_nossl.conf} +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a3bda48afdbb96a703ac7ea76507f58dceafb30c02299f2f3ac963e2a8aa8b9f
4
- data.tar.gz: a5375e95a37e5a0a6ac775b8ea5ef31a9a36f23f5b0ba8fac81a01a201234117
3
+ metadata.gz: fdc321f1b69dac3e66ca2e97c669ef29c9d1d957d4ad81c9bc065ab08bbfffdc
4
+ data.tar.gz: 924fa9bb8086f9777053f8ed03c826cf896a0d6188d59b37386a4027873b4d16
5
5
  SHA512:
6
- metadata.gz: 259564e75cf763267f054e241ac3189dadc66b86d06c3262fdd19c7b5c061e64185058091f0ccf511978a981992f8ad003e1fbb6ecb0b8d16e01e69af7e056ce
7
- data.tar.gz: 0a827508cdb7a4e112b272951442a4b40c1715f3f88c5b95dcbfe855ad14eff947d42c8a4805707b3d2d4d961a3f27b7f60fe0098f00a83c9692e8b0409233fe
6
+ metadata.gz: 47292837735d09deffe1f49f744a81c8d59e1f3b662260c25391118061e79b4038b171ec784ec32813ed44edd1c6bcc57ce1ba9702f1247081d5c7539458e6f3
7
+ data.tar.gz: b4b142adc3ac2d1bcdf0d10a4ea3dddac450e14e5d01163fc4e0b802d1cbf07297e4b756964df6242db5cc29ee34a3c83dd53920daf6f64475dbabc6a36fa9ac
data/lib/avmtrf1/tools/runner/php/docker.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avmtrf1/php/docker_images/factory'
3
+ require 'pd1_tools/php/docker_images/factory'
4
4
  require 'avmtrf1/docker/image_runner'
5
5
  require 'eac_cli/core_ext'
6
6
  require 'eac_docker/registry'
@@ -11,7 +11,7 @@ module Avmtrf1
11
11
  class Php
12
12
  class Docker < ::Avmtrf1::Docker::ImageRunner
13
13
  def docker_image_class(platform_version)
14
- ::Avmtrf1::Php::DockerImages::Factory.new(platform_version).result
14
+ ::Pd1Tools::Php::DockerImages::Factory.new(platform_version).result
15
15
  end
16
16
  end
17
17
  end
data/lib/{avmtrf1 → pd1_tools}/php/docker_images/base.rb RENAMED
@@ -4,7 +4,7 @@ require 'eac_ruby_utils/core_ext'
4
4
  require 'rubygems'
5
5
  require 'avmtrf1/docker/image'
6
6
 
7
- module Avmtrf1
7
+ module Pd1Tools
8
8
  module Php
9
9
  module DockerImages
10
10
  class Base < ::Avmtrf1::Docker::Image
@@ -32,7 +32,7 @@ module Avmtrf1
32
32
  end
33
33
 
34
34
  def write_in_provide_dir
35
- ::Avmtrf1::Php::DockerImages::Base.template.apply(self, provide_dir)
35
+ ::Pd1Tools::Php::DockerImages::Base.template.apply(self, provide_dir)
36
36
  end
37
37
 
38
38
  def gd_options
data/lib/{avmtrf1 → pd1_tools}/php/docker_images/factory.rb RENAMED
@@ -1,21 +1,21 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avmtrf1/php/docker_images/v5'
4
- require 'avmtrf1/php/docker_images/v7'
5
- require 'avmtrf1/php/docker_images/v7_v4'
6
- require 'avmtrf1/php/docker_images/v8'
3
+ require 'pd1_tools/php/docker_images/v5'
4
+ require 'pd1_tools/php/docker_images/v7'
5
+ require 'pd1_tools/php/docker_images/v7_v4'
6
+ require 'pd1_tools/php/docker_images/v8'
7
7
  require 'eac_ruby_utils/core_ext'
8
8
  require 'rubygems'
9
9
 
10
- module Avmtrf1
10
+ module Pd1Tools
11
11
  module Php
12
12
  module DockerImages
13
13
  class Factory
14
14
  VERSIONS = [
15
- ::Avmtrf1::Php::DockerImages::V8,
16
- ::Avmtrf1::Php::DockerImages::V7V4,
17
- ::Avmtrf1::Php::DockerImages::V7,
18
- ::Avmtrf1::Php::DockerImages::V5
15
+ ::Pd1Tools::Php::DockerImages::V8,
16
+ ::Pd1Tools::Php::DockerImages::V7V4,
17
+ ::Pd1Tools::Php::DockerImages::V7,
18
+ ::Pd1Tools::Php::DockerImages::V5
19
19
  ].freeze
20
20
 
21
21
  common_constructor :platform_version do
data/lib/{avmtrf1 → pd1_tools}/php/docker_images/v5.rb RENAMED
@@ -1,12 +1,12 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avmtrf1/php/docker_images/base'
3
+ require 'pd1_tools/php/docker_images/base'
4
4
  require 'eac_ruby_utils/core_ext'
5
5
 
6
- module Avmtrf1
6
+ module Pd1Tools
7
7
  module Php
8
8
  module DockerImages
9
- class V5 < ::Avmtrf1::Php::DockerImages::Base
9
+ class V5 < ::Pd1Tools::Php::DockerImages::Base
10
10
  MCRYPT_INSTALL = <<~CODE
11
11
  RUN docker-php-ext-install mcrypt
12
12
  CODE
data/lib/{avmtrf1 → pd1_tools}/php/docker_images/v7.rb RENAMED
@@ -1,12 +1,12 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avmtrf1/php/docker_images/base'
3
+ require 'pd1_tools/php/docker_images/base'
4
4
  require 'eac_ruby_utils/core_ext'
5
5
 
6
- module Avmtrf1
6
+ module Pd1Tools
7
7
  module Php
8
8
  module DockerImages
9
- class V7 < ::Avmtrf1::Php::DockerImages::Base
9
+ class V7 < ::Pd1Tools::Php::DockerImages::Base
10
10
  MCRYPT_INSTALL = <<~CODE
11
11
  RUN pecl install mcrypt
12
12
  RUN echo extension=mcrypt.so > "$PHP_INI_DIR/conf.d/mcrypt.ini"
data/lib/{avmtrf1 → pd1_tools}/php/docker_images/v7_v4.rb RENAMED
@@ -1,12 +1,12 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avmtrf1/php/docker_images/v7'
3
+ require 'pd1_tools/php/docker_images/v7'
4
4
  require 'eac_ruby_utils/core_ext'
5
5
 
6
- module Avmtrf1
6
+ module Pd1Tools
7
7
  module Php
8
8
  module DockerImages
9
- class V7V4 < ::Avmtrf1::Php::DockerImages::V7
9
+ class V7V4 < ::Pd1Tools::Php::DockerImages::V7
10
10
  GD_OPTION_PARSER = /\A(.+)-dir\z/.to_parser do |m|
11
11
  m[1]
12
12
  end
data/lib/{avmtrf1 → pd1_tools}/php/docker_images/v8.rb RENAMED
@@ -1,12 +1,12 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avmtrf1/php/docker_images/v7_v4'
3
+ require 'pd1_tools/php/docker_images/v7_v4'
4
4
  require 'eac_ruby_utils/core_ext'
5
5
 
6
- module Avmtrf1
6
+ module Pd1Tools
7
7
  module Php
8
8
  module DockerImages
9
- class V8 < ::Avmtrf1::Php::DockerImages::V7V4
9
+ class V8 < ::Pd1Tools::Php::DockerImages::V7V4
10
10
  PHP_VERSION = ::Gem::Version.new('8')
11
11
  XDEBUG_PECL_PACKAGE = 'xdebug'
12
12
 
data/lib/{avmtrf1 → pd1_tools}/php/docker_images.rb RENAMED
@@ -2,7 +2,7 @@
2
2
 
3
3
  require 'eac_ruby_utils/core_ext'
4
4
 
5
- module Avmtrf1
5
+ module Pd1Tools
6
6
  module Php
7
7
  module DockerImages
8
8
  require_sub __FILE__
data/lib/pd1_tools/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Pd1Tools
4
- VERSION = '0.44.0'
4
+ VERSION = '0.45.0'
5
5
  end
data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/Dockerfile.template RENAMED
@@ -95,6 +95,9 @@ RUN apt-get install -y git unzip
95
95
  RUN curl -sS https://getcomposer.org/installer | \
96
96
  php -- --install-dir=/usr/local/bin --filename=composer
97
97
 
98
+ # SSL
99
+ RUN apt-get install -y ssl-cert
100
+
98
101
  # Inicializador
99
102
  RUN mkdir '/aux'
100
103
  RUN mkdir '/aux/eac-bash-lib'
data/template/pd1_tools/php/docker_images/base/aux/init.sh ADDED
@@ -0,0 +1,13 @@
1
+ set -u
2
+ set -e
3
+
4
+ SOURCE="${BASH_SOURCE[0]}"
5
+ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
6
+ DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
7
+ SOURCE="$(readlink "$SOURCE")"
8
+ [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
9
+ done
10
+ export AUX_ROOT="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
11
+
12
+ source "$AUX_ROOT/lib.sh"
13
+ source "$AUX_ROOT/variables.sh"
data/template/{avmtrf1/php/docker_images/base/aux/setup_apache_site.sh → pd1_tools/php/docker_images/base/aux/setup_apache_modules.sh} RENAMED
@@ -12,5 +12,4 @@ done
12
12
  DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
13
13
  source "$DIR/init.sh"
14
14
 
15
- infom "Configuração site Apache..."
16
- template_apply "$TEMPLATES_ROOT/apache_site.conf" > '/etc/apache2/sites-available/000-default.conf'
15
+ a2enmod ssl
data/template/pd1_tools/php/docker_images/base/aux/setup_apache_sites.sh ADDED
@@ -0,0 +1,22 @@
1
+ #!/bin/bash
2
+
3
+ set -u
4
+ set -e
5
+
6
+ SOURCE="${BASH_SOURCE[0]}"
7
+ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
8
+ DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
9
+ SOURCE="$(readlink "$SOURCE")"
10
+ [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
11
+ done
12
+ DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
13
+ source "$DIR/init.sh"
14
+
15
+ function setup_site() {
16
+ template_apply "$TEMPLATES_ROOT/${1}.conf" > "/etc/apache2/sites-available/${2}.conf"
17
+ a2ensite "${2}"
18
+ }
19
+
20
+ infom "Configuração site Apache..."
21
+ setup_site 'apache_site_nossl' '000-default'
22
+ setup_site 'apache_site_ssl' 'default-ssl'
data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/aux/start.sh RENAMED
@@ -14,7 +14,8 @@ source "$DIR/init.sh"
14
14
 
15
15
  "$AUX_ROOT/config_banner.sh"
16
16
  source "$AUX_ROOT/apache_user.sh"
17
- "$AUX_ROOT/setup_apache_site.sh"
17
+ "$AUX_ROOT/setup_apache_modules.sh"
18
+ "$AUX_ROOT/setup_apache_sites.sh"
18
19
  "$AUX_ROOT/php_values.sh"
19
20
  "$AUX_ROOT/pear.sh"
20
21
  "$AUX_ROOT/php_composer.sh"
data/template/pd1_tools/php/docker_images/base/aux/templates/apache_site_ssl.conf ADDED
@@ -0,0 +1,16 @@
1
+ <VirtualHost *:443>
2
+ SSLEngine on
3
+ SSLCertificateFile "%%SSL_CERTIFICATE_FILE%%"
4
+ SSLCertificateKeyFile "%%SSL_CERTIFICATE_KEY_FILE%%"
5
+
6
+ DocumentRoot "%%DOCUMENT_ROOT%%"
7
+
8
+ ErrorLog ${APACHE_LOG_DIR}/error.log
9
+ CustomLog ${APACHE_LOG_DIR}/access.log combined
10
+
11
+ <Directory %%DOCUMENT_ROOT%%>
12
+ Options Indexes FollowSymLinks
13
+ AllowOverride All
14
+ Require all granted
15
+ </Directory>
16
+ </VirtualHost>
data/template/{avmtrf1/php/docker_images/base/aux/init.sh → pd1_tools/php/docker_images/base/aux/variables.sh} RENAMED
@@ -11,6 +11,10 @@ export AUX_ROOT="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
11
11
 
12
12
  source "$AUX_ROOT/lib.sh"
13
13
 
14
+ # Certificado SSL
15
+ export SSL_CERTIFICATE_FILE='/etc/ssl/certs/ssl-cert-snakeoil.pem'
16
+ export SSL_CERTIFICATE_KEY_FILE='/etc/ssl/private/ssl-cert-snakeoil.key'
17
+
14
18
  # Nome do usuário Apache
15
19
  export APACHE_USER_NAME='apache_app_user'
16
20
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pd1_tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.44.0
4
+ version: 0.45.0
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: 2024-09-13 00:00:00.000000000 Z
11
+ date: 2025-02-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aranha-parsers
@@ -432,13 +432,6 @@ files:
432
432
  - lib/avmtrf1/patches/avm/git/launcher/base.rb
433
433
  - lib/avmtrf1/patches/inifile.rb
434
434
  - lib/avmtrf1/php.rb
435
- - lib/avmtrf1/php/docker_images.rb
436
- - lib/avmtrf1/php/docker_images/base.rb
437
- - lib/avmtrf1/php/docker_images/factory.rb
438
- - lib/avmtrf1/php/docker_images/v5.rb
439
- - lib/avmtrf1/php/docker_images/v7.rb
440
- - lib/avmtrf1/php/docker_images/v7_v4.rb
441
- - lib/avmtrf1/php/docker_images/v8.rb
442
435
  - lib/avmtrf1/red.rb
443
436
  - lib/avmtrf1/red/client.rb
444
437
  - lib/avmtrf1/red/client/authorization.xml.erb
@@ -514,6 +507,13 @@ files:
514
507
  - lib/avmtrf1/tools/runner/red.rb
515
508
  - lib/avmtrf1/tools/runner/source.rb
516
509
  - lib/pd1_tools.rb
510
+ - lib/pd1_tools/php/docker_images.rb
511
+ - lib/pd1_tools/php/docker_images/base.rb
512
+ - lib/pd1_tools/php/docker_images/factory.rb
513
+ - lib/pd1_tools/php/docker_images/v5.rb
514
+ - lib/pd1_tools/php/docker_images/v7.rb
515
+ - lib/pd1_tools/php/docker_images/v7_v4.rb
516
+ - lib/pd1_tools/php/docker_images/v8.rb
517
517
  - lib/pd1_tools/version.rb
518
518
  - template/avmtrf1/node_js/docker_image/Dockerfile.template
519
519
  - template/avmtrf1/node_js/docker_image/auxiliary/config_banner.sh
@@ -522,21 +522,24 @@ files:
522
522
  - template/avmtrf1/node_js/docker_image/auxiliary/ng_serve.sh
523
523
  - template/avmtrf1/node_js/docker_image/auxiliary/npm_install.sh
524
524
  - template/avmtrf1/node_js/docker_image/auxiliary/start.sh
525
- - template/avmtrf1/php/docker_images/base/Dockerfile.template
526
- - template/avmtrf1/php/docker_images/base/aux/apache_foreground.sh
527
- - template/avmtrf1/php/docker_images/base/aux/apache_user.sh
528
- - template/avmtrf1/php/docker_images/base/aux/app_user_run.sh
529
- - template/avmtrf1/php/docker_images/base/aux/config_banner.sh
530
- - template/avmtrf1/php/docker_images/base/aux/init.sh
531
- - template/avmtrf1/php/docker_images/base/aux/laravel.sh
532
- - template/avmtrf1/php/docker_images/base/aux/lib.sh
533
- - template/avmtrf1/php/docker_images/base/aux/pear.sh
534
- - template/avmtrf1/php/docker_images/base/aux/php_composer.sh
535
- - template/avmtrf1/php/docker_images/base/aux/php_values.sh
536
- - template/avmtrf1/php/docker_images/base/aux/setup_apache_site.sh
537
- - template/avmtrf1/php/docker_images/base/aux/start.sh
538
- - template/avmtrf1/php/docker_images/base/aux/templates/apache_site.conf
539
525
  - template/avmtrf1/tools/msgraph/token_retrieve/python_retriever.py
526
+ - template/pd1_tools/php/docker_images/base/Dockerfile.template
527
+ - template/pd1_tools/php/docker_images/base/aux/apache_foreground.sh
528
+ - template/pd1_tools/php/docker_images/base/aux/apache_user.sh
529
+ - template/pd1_tools/php/docker_images/base/aux/app_user_run.sh
530
+ - template/pd1_tools/php/docker_images/base/aux/config_banner.sh
531
+ - template/pd1_tools/php/docker_images/base/aux/init.sh
532
+ - template/pd1_tools/php/docker_images/base/aux/laravel.sh
533
+ - template/pd1_tools/php/docker_images/base/aux/lib.sh
534
+ - template/pd1_tools/php/docker_images/base/aux/pear.sh
535
+ - template/pd1_tools/php/docker_images/base/aux/php_composer.sh
536
+ - template/pd1_tools/php/docker_images/base/aux/php_values.sh
537
+ - template/pd1_tools/php/docker_images/base/aux/setup_apache_modules.sh
538
+ - template/pd1_tools/php/docker_images/base/aux/setup_apache_sites.sh
539
+ - template/pd1_tools/php/docker_images/base/aux/start.sh
540
+ - template/pd1_tools/php/docker_images/base/aux/templates/apache_site_nossl.conf
541
+ - template/pd1_tools/php/docker_images/base/aux/templates/apache_site_ssl.conf
542
+ - template/pd1_tools/php/docker_images/base/aux/variables.sh
540
543
  homepage: http://redmine.trf1.gov.br/projects/avm-trf1
541
544
  licenses: []
542
545
  metadata: {}