avmtrf1-tools 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b60215acd55ddb829cd6715af567e261ed1364e77e8ace899df4172b6b363b5e
-  data.tar.gz: 524c6908f81566907043f828324832e8a1c9d5327181e2e1658f46ef8336b208
+  metadata.gz: a424e7a0b85bf3eee88a0d7bc0f9b4284bc084a39f80aa706f199bf5d1abbbc5
+  data.tar.gz: 57418723c9b566b56c578bd83d074ba2e284e1da6069a1f2f75470eac07625a2
 SHA512:
-  metadata.gz: 5516996e7a05dcfdfe75ffb5de4730760289b4ceefd3a90e1a0e9e0942a28fdb7597b8ffb7a1eeb8ba9c4510142ee7e9baf7e9ad9ad3bf2b68e891b0f30dcbfd
-  data.tar.gz: a24a139da54faf8d647099fbc6708a0576bda4ee8c6fae741e89ab1db14413e9f159f6c99fca80213d4f481b7dd2fb1260be23a2e71e6477cd3978663bda4298
+  metadata.gz: 2732822fdb099ce76ef2f06325aa0199a4044ba509b1bb6569ab7f288620236970472308a269df12c035bc449a85472c87abb5d899beace8aecd3a7a385e9778
+  data.tar.gz: 10dea2abd45d22dc1e9697b5a578c542822389e6d8c0086c225c04a706d3f5b0192fb27c933e2a8edcd021a2165deead6d6208e9ebd3c059eb931e38d6c1d9b9

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.18.1'
+    VERSION = '0.19.0'
   end
 end

data/template/avmtrf1/php/docker_image/Dockerfile.template

@@ -91,7 +91,7 @@ RUN curl -sS https://getcomposer.org/installer | \
 # Inicializador
 RUN mkdir '/aux'
 RUN mkdir '/aux/eac-bash-lib'
-RUN wget -qO- https://github.com/esquilo-azul/eac-bash-lib/archive/cb31a3db2e3a6e356bcd0346b7a7b6ebb7d97d36.tar.gz \
+RUN wget -qO- https://github.com/esquilo-azul/eac-bash-lib/archive/v0.6.1.tar.gz \
   | tar -xzf - --strip-components 1 -C '/aux/eac-bash-lib'
 ADD aux '/aux'
 CMD '/aux/start.sh'

data/template/avmtrf1/php/docker_image/aux/apache_user.sh

@@ -0,0 +1,16 @@
+#!/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"
+
+infom "Alterando ID do usuário Apache..."
+usermod -u "$APACHE_USER_ID" "$APACHE_USER_NAME"

data/template/avmtrf1/php/docker_image/aux/config_banner.sh

@@ -16,4 +16,5 @@ infov 'Application root path ($APP_ROOT)' "$APP_ROOT"
 infov "Apache\'s document root (\$DOCUMENT_ROOT)" "$DOCUMENT_ROOT"
 infov 'PHP Composer directories ($COMPOSER_PATH)' "$COMPOSER_PATH"
 infov 'Laravel directories ($LARAVEL_PATH)' "$LARAVEL_PATH"
+infov 'Apache user ID' "$APACHE_USER_ID"
 infov 'Run Apache? ($RUN_APACHE)' "$RUN_APACHE"

data/template/avmtrf1/php/docker_image/aux/init.sh

@@ -11,20 +11,12 @@ export AUX_ROOT="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 
 source "$AUX_ROOT/lib.sh"
 
+# Nome do usuário Apache
+export APACHE_USER_NAME='www-data'
+
 # Diretório de templates
 export TEMPLATES_ROOT="$AUX_ROOT/templates"
 
-function text_set() {
-  VARIABLE_NAME="$1"
-  DEFAULT_VALUE="$2"
-
-  RESULT="$DEFAULT_VALUE"
-  if var_present_r "$VARIABLE_NAME"; then
-    RESULT="${!VARIABLE_NAME}"
-  fi
-  export $VARIABLE_NAME="$RESULT"
-}
-
 # Caminho raiz da aplicação
 path_set 'APP_ROOT' '/' '/app'
 
@@ -42,3 +34,6 @@ text_set 'PEAR_PACKAGES' ''
 
 # Execução do Apache
 bool_set 'RUN_APACHE' true
+
+# ID do usuário Apache
+text_set 'APACHE_USER_ID' "$(stat -c '%g' "$APP_ROOT")"

data/template/avmtrf1/php/docker_image/aux/lib.sh

@@ -3,10 +3,6 @@ set -e
 
 source "$AUX_ROOT/eac-bash-lib/init.sh"
 
-function var_present_r() {
-  [[ -v "$1" ]] && [[ -n "${!1}" ]]
-}
-
 function bool_set() {
   VARIABLE_NAME="$1"
   DEFAULT_VALUE="$2"
@@ -43,3 +39,14 @@ function path_set() {
   fi
   export $VARIABLE_NAME="$RESULT"
 }
+
+function text_set() {
+  VARIABLE_NAME="$1"
+  DEFAULT_VALUE="$2"
+
+  RESULT="$DEFAULT_VALUE"
+  if var_present_r "$VARIABLE_NAME"; then
+    RESULT="${!VARIABLE_NAME}"
+  fi
+  export $VARIABLE_NAME="$RESULT"
+}

data/template/avmtrf1/php/docker_image/aux/start.sh

@@ -13,6 +13,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/init.sh"
 
 "$AUX_ROOT/config_banner.sh"
+"$AUX_ROOT/apache_user.sh"
 "$AUX_ROOT/setup_apache_site.sh"
 "$AUX_ROOT/pear.sh"
 "$AUX_ROOT/php_composer.sh"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -351,6 +351,7 @@ files:
 - lib/avmtrf1/trf1_dspace_base0/instance.rb
 - template/avmtrf1/php/docker_image/Dockerfile.template
 - template/avmtrf1/php/docker_image/aux/apache_foreground.sh
+- template/avmtrf1/php/docker_image/aux/apache_user.sh
 - template/avmtrf1/php/docker_image/aux/config_banner.sh
 - template/avmtrf1/php/docker_image/aux/init.sh
 - template/avmtrf1/php/docker_image/aux/laravel.sh