avmtrf1-tools 0.39.6 → 0.39.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3f26b0210df64425354daf7e5d9ac10dcb0aecbb51b00f9079ac5dc1ff5e8e2
-  data.tar.gz: 7a1ee3b449c30d1ad515d28359aaf8b8a15442bb995a6797a12bce30eba61a25
+  metadata.gz: 3ff10204c30ec6cd792506a13db51d8fc7460eb9e86b17832596808f32f6e17d
+  data.tar.gz: 1ccf217dbdb39e3b5249a04a5cba1abc103cb7a9573a77823fff7be433b6f6ea
 SHA512:
-  metadata.gz: 11a4f7ec4a34de508424eceb46f9d3358d3b9e11e1b5f0fcf9375169dc6df8a50193fdbe9891069b0b5e0adb7fa88181a0f04246774afa88e47dd19b5d96645c
-  data.tar.gz: 3607982ce6d014d551c92a323b308143b6b02e473fbb03dddf8c8a8768aeafade90a5a6dbae49cecef16c5037e6555651383c2b9c3a8893e1d505d7a6e3d57af
+  metadata.gz: 8bb6a402eecd5eec3a2addaa090f700b48c4bd7d95385e9661a1102429d4284f3d3715f88a67520288c8df43684b7e00fa6685d3bc6422f81feda21dd019998f
+  data.tar.gz: 258fd349764cb1cf8ae5f37375bb8954840a74fab6a54dc871071b2b63bfe84bb25c67d69e622728445035d52bf9522886e7d127d5ffeee992246532fbf66c5b

data/lib/avmtrf1/docker/image.rb

@@ -2,6 +2,7 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'avm/docker/image'
+require 'avmtrf1/tools/version'
 require 'eac_templates/sources/from_all_gems'
 
 module Avmtrf1
@@ -11,6 +12,27 @@ module Avmtrf1
 
       common_constructor :registry, :platform_version
 
+      APT_SETUP = <<CODE
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get -y update
+RUN apt-get -y dist-upgrade
+CODE
+      DEBIAN_STRETCH_FIX_SOURCES = <<CODE
+RUN echo 'deb http://security.debian.org/debian-security stable-security/updates main' > /etc/apt/sources.list
+RUN echo 'deb http://archive.debian.org/debian stretch main' >> /etc/apt/sources.list
+CODE
+      DEBIAN_STRETCH_APT_SETUP = DEBIAN_STRETCH_FIX_SOURCES + APT_SETUP
+
+      # @return [String]
+      def apt_setup
+        APT_SETUP
+      end
+
+      # @return [String]
+      def debian_stretch_apt_setup
+        DEBIAN_STRETCH_APT_SETUP
+      end
+
       def platform_stereotype_tag
         self.class.name.split('::')[-2].underscore.dasherize
       end

data/lib/avmtrf1/node_js/docker_image.rb

@@ -5,6 +5,10 @@ require 'avmtrf1/docker/image'
 module Avmtrf1
   module NodeJs
     class DockerImage < ::Avmtrf1::Docker::Image
+      # @return [String]
+      def apt_setup
+        debian_stretch_apt_setup.gsub('-y dist-upgrade', '-y --allow-unauthenticated dist-upgrade')
+      end
     end
   end
 end

data/lib/avmtrf1/php/docker_images/base.rb

@@ -11,7 +11,6 @@ module Avmtrf1
         enable_abstract_methods
         abstract_methods :mcrypt_install, :xdebug_pecl_package
 
-        DEFAULT_BEFORE_CODE = ''
         GD_OPTIONS = %w[--with-gd --with-webp-dir --with-jpeg-dir --with-png-dir --with-zlib-dir
                         --with-xpm-dir --with-freetype-dir].freeze
         PLATFORM_STEREOTYPE_TAG = 'php'
@@ -23,11 +22,6 @@ module Avmtrf1
           end
         end
 
-        # @return [String]
-        def before_code
-          DEFAULT_BEFORE_CODE
-        end
-
         # @return [String]
         def php_dist_curl_args
           '-sS "https://www.php.net/distributions/php-$PHP_VERSION.tar.gz"'

data/lib/avmtrf1/php/docker_images/v5.rb

@@ -7,10 +7,6 @@ module Avmtrf1
   module Php
     module DockerImages
       class V5 < ::Avmtrf1::Php::DockerImages::Base
-        BEFORE_CODE = <<CODE
-RUN echo 'deb http://security.debian.org/debian-security stable-security/updates main' > /etc/apt/sources.list
-RUN echo 'deb http://archive.debian.org/debian stretch main' >> /etc/apt/sources.list
-CODE
         MCRYPT_INSTALL = <<~CODE
         RUN docker-php-ext-install mcrypt
         CODE
@@ -28,8 +24,8 @@ RUN cd /tmp && \
 CODE
 
         # @return [String]
-        def before_code
-          BEFORE_CODE
+        def apt_setup
+          debian_stretch_apt_setup
         end
 
         # @return [String]

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.39.6'
+    VERSION = '0.39.7'
   end
 end

data/template/avmtrf1/node_js/docker_image/Dockerfile.template

@@ -1,6 +1,20 @@
 # base image
 FROM node:%%PLATFORM_VERSION%%
 
+%%APT_SETUP%%
+
+# ASDF - 0.12.0
+ENV ASDF_DIR='/opt/asdf'
+ENV ASDF_PACKAGE='https://github.com/asdf-vm/asdf/archive/816195d615427b033a7426a4fb4d7fac4cf2d791.tar.gz'
+RUN mkdir -p "${ASDF_DIR}"
+RUN wget -qO- "${ASDF_PACKAGE}" | tar -xzf - --strip-components 1 -C "${ASDF_DIR}"
+
+# Python
+ENV PYTHON_VERSION='3.6.15'
+RUN "${ASDF_DIR}/bin/asdf" plugin add python
+RUN "${ASDF_DIR}/bin/asdf" install python "${PYTHON_VERSION}"
+RUN "${ASDF_DIR}/bin/asdf" global python "${PYTHON_VERSION}"
+
 # Inicializador
 RUN mkdir '/auxiliary'
 RUN mkdir '/auxiliary/eac-bash-lib'

data/template/avmtrf1/node_js/docker_image/auxiliary/init.sh

@@ -10,6 +10,7 @@ done
 export AUX_ROOT="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 
 source "$AUX_ROOT/lib.sh"
+source "${ASDF_DIR}/asdf.sh"
 
 # Caminho raiz da aplicação
 path_set 'APP_ROOT' '/' '/app'

data/template/avmtrf1/php/docker_images/base/Dockerfile.template

@@ -1,11 +1,6 @@
 FROM php:%%PLATFORM_VERSION%%-apache
 
-%%BEFORE_CODE%%
-
-# Base ubuntu
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get -y update
-RUN apt-get -y dist-upgrade
+%%APT_SETUP%%
 
 # Apache HTTP
 RUN a2enmod rewrite

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.39.6
+  version: 0.39.7
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-23 00:00:00.000000000 Z
+date: 2023-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-selenium