pd1_tools 0.44.0 → 0.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3bda48afdbb96a703ac7ea76507f58dceafb30c02299f2f3ac963e2a8aa8b9f
-  data.tar.gz: a5375e95a37e5a0a6ac775b8ea5ef31a9a36f23f5b0ba8fac81a01a201234117
+  metadata.gz: fdc321f1b69dac3e66ca2e97c669ef29c9d1d957d4ad81c9bc065ab08bbfffdc
+  data.tar.gz: 924fa9bb8086f9777053f8ed03c826cf896a0d6188d59b37386a4027873b4d16
 SHA512:
-  metadata.gz: 259564e75cf763267f054e241ac3189dadc66b86d06c3262fdd19c7b5c061e64185058091f0ccf511978a981992f8ad003e1fbb6ecb0b8d16e01e69af7e056ce
-  data.tar.gz: 0a827508cdb7a4e112b272951442a4b40c1715f3f88c5b95dcbfe855ad14eff947d42c8a4805707b3d2d4d961a3f27b7f60fe0098f00a83c9692e8b0409233fe
+  metadata.gz: 47292837735d09deffe1f49f744a81c8d59e1f3b662260c25391118061e79b4038b171ec784ec32813ed44edd1c6bcc57ce1ba9702f1247081d5c7539458e6f3
+  data.tar.gz: b4b142adc3ac2d1bcdf0d10a4ea3dddac450e14e5d01163fc4e0b802d1cbf07297e4b756964df6242db5cc29ee34a3c83dd53920daf6f64475dbabc6a36fa9ac

data/lib/avmtrf1/tools/runner/php/docker.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/php/docker_images/factory'
+require 'pd1_tools/php/docker_images/factory'
 require 'avmtrf1/docker/image_runner'
 require 'eac_cli/core_ext'
 require 'eac_docker/registry'
@@ -11,7 +11,7 @@ module Avmtrf1
       class Php
         class Docker < ::Avmtrf1::Docker::ImageRunner
           def docker_image_class(platform_version)
-            ::Avmtrf1::Php::DockerImages::Factory.new(platform_version).result
+            ::Pd1Tools::Php::DockerImages::Factory.new(platform_version).result
           end
         end
       end

data/lib/{avmtrf1 → pd1_tools}/php/docker_images/base.rb

@@ -4,7 +4,7 @@ require 'eac_ruby_utils/core_ext'
 require 'rubygems'
 require 'avmtrf1/docker/image'
 
-module Avmtrf1
+module Pd1Tools
   module Php
     module DockerImages
       class Base < ::Avmtrf1::Docker::Image
@@ -32,7 +32,7 @@ module Avmtrf1
         end
 
         def write_in_provide_dir
-          ::Avmtrf1::Php::DockerImages::Base.template.apply(self, provide_dir)
+          ::Pd1Tools::Php::DockerImages::Base.template.apply(self, provide_dir)
         end
 
         def gd_options

data/lib/{avmtrf1 → pd1_tools}/php/docker_images/factory.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/php/docker_images/v5'
-require 'avmtrf1/php/docker_images/v7'
-require 'avmtrf1/php/docker_images/v7_v4'
-require 'avmtrf1/php/docker_images/v8'
+require 'pd1_tools/php/docker_images/v5'
+require 'pd1_tools/php/docker_images/v7'
+require 'pd1_tools/php/docker_images/v7_v4'
+require 'pd1_tools/php/docker_images/v8'
 require 'eac_ruby_utils/core_ext'
 require 'rubygems'
 
-module Avmtrf1
+module Pd1Tools
   module Php
     module DockerImages
       class Factory
         VERSIONS = [
-          ::Avmtrf1::Php::DockerImages::V8,
-          ::Avmtrf1::Php::DockerImages::V7V4,
-          ::Avmtrf1::Php::DockerImages::V7,
-          ::Avmtrf1::Php::DockerImages::V5
+          ::Pd1Tools::Php::DockerImages::V8,
+          ::Pd1Tools::Php::DockerImages::V7V4,
+          ::Pd1Tools::Php::DockerImages::V7,
+          ::Pd1Tools::Php::DockerImages::V5
         ].freeze
 
         common_constructor :platform_version do

data/lib/{avmtrf1 → pd1_tools}/php/docker_images/v5.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/php/docker_images/base'
+require 'pd1_tools/php/docker_images/base'
 require 'eac_ruby_utils/core_ext'
 
-module Avmtrf1
+module Pd1Tools
   module Php
     module DockerImages
-      class V5 < ::Avmtrf1::Php::DockerImages::Base
+      class V5 < ::Pd1Tools::Php::DockerImages::Base
         MCRYPT_INSTALL = <<~CODE
           RUN docker-php-ext-install mcrypt
         CODE

data/lib/{avmtrf1 → pd1_tools}/php/docker_images/v7.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/php/docker_images/base'
+require 'pd1_tools/php/docker_images/base'
 require 'eac_ruby_utils/core_ext'
 
-module Avmtrf1
+module Pd1Tools
   module Php
     module DockerImages
-      class V7 < ::Avmtrf1::Php::DockerImages::Base
+      class V7 < ::Pd1Tools::Php::DockerImages::Base
         MCRYPT_INSTALL = <<~CODE
           RUN pecl install mcrypt
           RUN echo extension=mcrypt.so > "$PHP_INI_DIR/conf.d/mcrypt.ini"

data/lib/{avmtrf1 → pd1_tools}/php/docker_images/v7_v4.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/php/docker_images/v7'
+require 'pd1_tools/php/docker_images/v7'
 require 'eac_ruby_utils/core_ext'
 
-module Avmtrf1
+module Pd1Tools
   module Php
     module DockerImages
-      class V7V4 < ::Avmtrf1::Php::DockerImages::V7
+      class V7V4 < ::Pd1Tools::Php::DockerImages::V7
         GD_OPTION_PARSER = /\A(.+)-dir\z/.to_parser do |m|
           m[1]
         end

data/lib/{avmtrf1 → pd1_tools}/php/docker_images/v8.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/php/docker_images/v7_v4'
+require 'pd1_tools/php/docker_images/v7_v4'
 require 'eac_ruby_utils/core_ext'
 
-module Avmtrf1
+module Pd1Tools
   module Php
     module DockerImages
-      class V8 < ::Avmtrf1::Php::DockerImages::V7V4
+      class V8 < ::Pd1Tools::Php::DockerImages::V7V4
         PHP_VERSION = ::Gem::Version.new('8')
         XDEBUG_PECL_PACKAGE = 'xdebug'
 

data/lib/{avmtrf1 → pd1_tools}/php/docker_images.rb

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/core_ext'
 
-module Avmtrf1
+module Pd1Tools
   module Php
     module DockerImages
       require_sub __FILE__

data/lib/pd1_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pd1Tools
-  VERSION = '0.44.0'
+  VERSION = '0.45.0'
 end

data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/Dockerfile.template

@@ -95,6 +95,9 @@ RUN apt-get install -y git unzip
 RUN curl -sS https://getcomposer.org/installer | \
   php -- --install-dir=/usr/local/bin --filename=composer
 
+# SSL
+RUN apt-get install -y ssl-cert
+
 # Inicializador
 RUN mkdir '/aux'
 RUN mkdir '/aux/eac-bash-lib'

data/template/pd1_tools/php/docker_images/base/aux/init.sh

@@ -0,0 +1,13 @@
+set -u
+set -e
+
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
+  SOURCE="$(readlink "$SOURCE")"
+  [[ $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
+done
+export AUX_ROOT="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
+
+source "$AUX_ROOT/lib.sh"
+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}

@@ -12,5 +12,4 @@ done
 DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/init.sh"
 
-infom "Configuração site Apache..."
-template_apply "$TEMPLATES_ROOT/apache_site.conf" > '/etc/apache2/sites-available/000-default.conf'
+a2enmod ssl

data/template/pd1_tools/php/docker_images/base/aux/setup_apache_sites.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -u
+set -e
+
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
+  SOURCE="$(readlink "$SOURCE")"
+  [[ $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
+done
+DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
+source "$DIR/init.sh"
+
+function setup_site() {
+  template_apply "$TEMPLATES_ROOT/${1}.conf" > "/etc/apache2/sites-available/${2}.conf"
+  a2ensite "${2}"
+}
+
+infom "Configuração site Apache..."
+setup_site 'apache_site_nossl' '000-default'
+setup_site 'apache_site_ssl' 'default-ssl'

data/template/{avmtrf1 → pd1_tools}/php/docker_images/base/aux/start.sh

@@ -14,7 +14,8 @@ source "$DIR/init.sh"
 
 "$AUX_ROOT/config_banner.sh"
 source "$AUX_ROOT/apache_user.sh"
-"$AUX_ROOT/setup_apache_site.sh"
+"$AUX_ROOT/setup_apache_modules.sh"
+"$AUX_ROOT/setup_apache_sites.sh"
 "$AUX_ROOT/php_values.sh"
 "$AUX_ROOT/pear.sh"
 "$AUX_ROOT/php_composer.sh"

data/template/pd1_tools/php/docker_images/base/aux/templates/apache_site_ssl.conf

@@ -0,0 +1,16 @@
+<VirtualHost *:443>
+  SSLEngine on
+  SSLCertificateFile "%%SSL_CERTIFICATE_FILE%%"
+  SSLCertificateKeyFile "%%SSL_CERTIFICATE_KEY_FILE%%"
+
+  DocumentRoot "%%DOCUMENT_ROOT%%"
+
+  ErrorLog ${APACHE_LOG_DIR}/error.log
+  CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+  <Directory %%DOCUMENT_ROOT%%>
+    Options Indexes FollowSymLinks
+    AllowOverride All
+    Require all granted
+  </Directory>
+</VirtualHost>

data/template/{avmtrf1/php/docker_images/base/aux/init.sh → pd1_tools/php/docker_images/base/aux/variables.sh}

@@ -11,6 +11,10 @@ export AUX_ROOT="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 
 source "$AUX_ROOT/lib.sh"
 
+# Certificado SSL
+export SSL_CERTIFICATE_FILE='/etc/ssl/certs/ssl-cert-snakeoil.pem'
+export SSL_CERTIFICATE_KEY_FILE='/etc/ssl/private/ssl-cert-snakeoil.key'
+
 # Nome do usuário Apache
 export APACHE_USER_NAME='apache_app_user'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pd1_tools
 version: !ruby/object:Gem::Version
-  version: 0.44.0
+  version: 0.45.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-13 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -432,13 +432,6 @@ files:
 - lib/avmtrf1/patches/avm/git/launcher/base.rb
 - lib/avmtrf1/patches/inifile.rb
 - lib/avmtrf1/php.rb
-- lib/avmtrf1/php/docker_images.rb
-- lib/avmtrf1/php/docker_images/base.rb
-- lib/avmtrf1/php/docker_images/factory.rb
-- lib/avmtrf1/php/docker_images/v5.rb
-- lib/avmtrf1/php/docker_images/v7.rb
-- lib/avmtrf1/php/docker_images/v7_v4.rb
-- lib/avmtrf1/php/docker_images/v8.rb
 - lib/avmtrf1/red.rb
 - lib/avmtrf1/red/client.rb
 - lib/avmtrf1/red/client/authorization.xml.erb
@@ -514,6 +507,13 @@ files:
 - lib/avmtrf1/tools/runner/red.rb
 - lib/avmtrf1/tools/runner/source.rb
 - lib/pd1_tools.rb
+- lib/pd1_tools/php/docker_images.rb
+- lib/pd1_tools/php/docker_images/base.rb
+- lib/pd1_tools/php/docker_images/factory.rb
+- lib/pd1_tools/php/docker_images/v5.rb
+- lib/pd1_tools/php/docker_images/v7.rb
+- lib/pd1_tools/php/docker_images/v7_v4.rb
+- lib/pd1_tools/php/docker_images/v8.rb
 - lib/pd1_tools/version.rb
 - template/avmtrf1/node_js/docker_image/Dockerfile.template
 - template/avmtrf1/node_js/docker_image/auxiliary/config_banner.sh
@@ -522,21 +522,24 @@ files:
 - template/avmtrf1/node_js/docker_image/auxiliary/ng_serve.sh
 - template/avmtrf1/node_js/docker_image/auxiliary/npm_install.sh
 - template/avmtrf1/node_js/docker_image/auxiliary/start.sh
-- template/avmtrf1/php/docker_images/base/Dockerfile.template
-- template/avmtrf1/php/docker_images/base/aux/apache_foreground.sh
-- template/avmtrf1/php/docker_images/base/aux/apache_user.sh
-- template/avmtrf1/php/docker_images/base/aux/app_user_run.sh
-- template/avmtrf1/php/docker_images/base/aux/config_banner.sh
-- template/avmtrf1/php/docker_images/base/aux/init.sh
-- template/avmtrf1/php/docker_images/base/aux/laravel.sh
-- template/avmtrf1/php/docker_images/base/aux/lib.sh
-- template/avmtrf1/php/docker_images/base/aux/pear.sh
-- template/avmtrf1/php/docker_images/base/aux/php_composer.sh
-- template/avmtrf1/php/docker_images/base/aux/php_values.sh
-- template/avmtrf1/php/docker_images/base/aux/setup_apache_site.sh
-- template/avmtrf1/php/docker_images/base/aux/start.sh
-- template/avmtrf1/php/docker_images/base/aux/templates/apache_site.conf
 - template/avmtrf1/tools/msgraph/token_retrieve/python_retriever.py
+- template/pd1_tools/php/docker_images/base/Dockerfile.template
+- template/pd1_tools/php/docker_images/base/aux/apache_foreground.sh
+- template/pd1_tools/php/docker_images/base/aux/apache_user.sh
+- template/pd1_tools/php/docker_images/base/aux/app_user_run.sh
+- template/pd1_tools/php/docker_images/base/aux/config_banner.sh
+- template/pd1_tools/php/docker_images/base/aux/init.sh
+- template/pd1_tools/php/docker_images/base/aux/laravel.sh
+- template/pd1_tools/php/docker_images/base/aux/lib.sh
+- template/pd1_tools/php/docker_images/base/aux/pear.sh
+- template/pd1_tools/php/docker_images/base/aux/php_composer.sh
+- template/pd1_tools/php/docker_images/base/aux/php_values.sh
+- template/pd1_tools/php/docker_images/base/aux/setup_apache_modules.sh
+- template/pd1_tools/php/docker_images/base/aux/setup_apache_sites.sh
+- template/pd1_tools/php/docker_images/base/aux/start.sh
+- template/pd1_tools/php/docker_images/base/aux/templates/apache_site_nossl.conf
+- template/pd1_tools/php/docker_images/base/aux/templates/apache_site_ssl.conf
+- template/pd1_tools/php/docker_images/base/aux/variables.sh
 homepage: http://redmine.trf1.gov.br/projects/avm-trf1
 licenses: []
 metadata: {}