Skip to content

Commit

Permalink
Versão 3.6.2 (#122)
Browse files Browse the repository at this point in the history 
- Nos conteineres app-ci antes de fazer o checkout do modulo para instalar usa o comando git pull e git pull --tags, para trazer novas tags e commits antes da instalacao
- Ajuste no job atualizador kubernetes para falhar no max 3x antes estava 6
- Ajustes para as novas variaveis do modulo de assinatura avançada
- Imagem Jod4.4.8 para o SEI 5
- Jod4.48 disponivel nos ecossistemas conteineres, dev e infra

---------

Co-authored-by: Carlos Vieira <[email protected]>
  • Loading branch information
@marlinhares @caduvieira
marlinhares and caduvieira authored Feb 13, 2025
1 parent cf81d35 commit 8cc7f26
Show file tree
Hide file tree
Showing 22 changed files with 153 additions and 32 deletions.
17 changes: 14 additions & 3 deletions containers/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ erase-conteiner-memcached: ## apagar a imagem memcached
erase-conteiner-jod: ## apagar a imagem jod
@make IMAGEMTMP=jod IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) erase-conteiner-generic

erase-conteiner-jod4.4.8: ## apagar a imagem jod4.4.8
@make IMAGEMTMP=jod4.4.8 IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) erase-conteiner-generic

erase-conteiner-mailcatcher: ## apagar a imagem mailcatcher
@make IMAGEMTMP=mailcatcher IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) erase-conteiner-generic
Expand Down Expand Up @@ -305,7 +307,7 @@ erase-conteiner-dbadminer: ## apagar a imagem dbadminer
@make IMAGEMTMP=dbadminer IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) erase-conteiner-generic

## erase-conteiners-local: target que chama todos os outros targets para apagar as imagens do projeto
erase-conteiners-local: erase-conteiner-app-ci-agendador erase-conteiner-app-ci-php8-agendador erase-conteiner-app-ci erase-conteiner-app-ci-php8 erase-conteiner-app-dev erase-conteiner-app-dev-php8 erase-conteiner-base-app erase-conteiner-base-app-php8 erase-conteiner-solr erase-conteiner-solr-9.4.0 erase-conteiner-solr-9.6.1 erase-conteiner-memcached erase-conteiner-jod erase-conteiner-mailcatcher erase-conteiner-mariadb-sei40 erase-conteiner-mariadb-sei41 erase-conteiner-mariadb-sei50 erase-conteiner-mysql8-sei41 erase-conteiner-mysql8-sei50 erase-conteiner-base-mariadb erase-conteiner-base-mysql8 erase-conteiner-sqlserver-sei40 erase-conteiner-sqlserver-sei41 erase-conteiner-sqlserver-sei50 erase-conteiner-base-sqlserver erase-conteiner-oracle-sei40 erase-conteiner-oracle-sei41 erase-conteiner-oracle-sei50 erase-conteiner-base-oracle erase-conteiner-postgres-sei40 erase-conteiner-postgres-sei41 erase-conteiner-postgres-sei50 erase-conteiner-base-postgres erase-conteiner-base-centos erase-conteiner-phpmemcachedadmin erase-conteiner-phpmemcachedadmin-base erase-conteiner-openldap erase-conteiner-openldap-base erase-conteiner-haproxy erase-conteiner-haproxy-base erase-conteiner-traefik erase-conteiner-traefik-base erase-conteiner-phpldapadmin erase-conteiner-dbadminer
erase-conteiners-local: erase-conteiner-app-ci-agendador erase-conteiner-app-ci-php8-agendador erase-conteiner-app-ci erase-conteiner-app-ci-php8 erase-conteiner-app-dev erase-conteiner-app-dev-php8 erase-conteiner-base-app erase-conteiner-base-app-php8 erase-conteiner-solr erase-conteiner-solr-9.4.0 erase-conteiner-solr-9.6.1 erase-conteiner-memcached erase-conteiner-jod erase-conteiner-jod4.4.8 erase-conteiner-mailcatcher erase-conteiner-mariadb-sei40 erase-conteiner-mariadb-sei41 erase-conteiner-mariadb-sei50 erase-conteiner-mysql8-sei41 erase-conteiner-mysql8-sei50 erase-conteiner-base-mariadb erase-conteiner-base-mysql8 erase-conteiner-sqlserver-sei40 erase-conteiner-sqlserver-sei41 erase-conteiner-sqlserver-sei50 erase-conteiner-base-sqlserver erase-conteiner-oracle-sei40 erase-conteiner-oracle-sei41 erase-conteiner-oracle-sei50 erase-conteiner-base-oracle erase-conteiner-postgres-sei40 erase-conteiner-postgres-sei41 erase-conteiner-postgres-sei50 erase-conteiner-base-postgres erase-conteiner-base-centos erase-conteiner-phpmemcachedadmin erase-conteiner-phpmemcachedadmin-base erase-conteiner-openldap erase-conteiner-openldap-base erase-conteiner-haproxy erase-conteiner-haproxy-base erase-conteiner-traefik erase-conteiner-traefik-base erase-conteiner-phpldapadmin erase-conteiner-dbadminer


#*****************************************************
Expand Down Expand Up @@ -350,6 +352,13 @@ build-conteiner-jod: verificar-imagem-base-centos
BUILD_ARGS=--build-arg\ IMAGEM_BASE=$(IMAGEM_BASE_CENTOS):$(IMAGEM_BASE_CENTOS_VERSAO) \
build-conteiner-generic

## build-conteiner-jod4.4.8: construir imagem jod4.4.8
build-conteiner-jod4.4.8:
@make IMAGEMTMP=jod4.4.8 \
IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) \
IMAGEMTMP_PATH=jod4.4.8 \
BUILD_ARGS=--build-arg\ IMAGEM_BASE=$(IMAGEM_BASE_CENTOS):$(IMAGEM_BASE_CENTOS_VERSAO) \
build-conteiner-generic

build-conteiner-mailcatcher: ## construir imagem mailcatcher
@make IMAGEMTMP=mailcatcher \
Expand Down Expand Up @@ -676,7 +685,7 @@ build-conteiner-dbadminer: ## construir imagem dbadminer


## build-conteiners: roda todos os outros targets de build na sequencia
build-conteiners: verificar-git-parameters build-conteiner-base-centos build-conteiner-base-rocky93 build-conteiner-memcached build-conteiner-jod build-conteiner-mailcatcher build-conteiner-traefik-base build-conteiner-traefik build-conteiner-base-mariadb build-conteiner-base-mysql8 build-conteiner-mariadb-sei40 build-conteiner-mariadb-sei41 build-conteiner-mariadb-sei50 build-conteiner-mysql8-sei41 build-conteiner-mysql8-sei50 build-conteiner-base-sqlserver build-conteiner-sqlserver-sei40 build-conteiner-sqlserver-sei41 build-conteiner-sqlserver-sei50 build-conteiner-base-oracle build-conteiner-oracle-sei40 build-conteiner-oracle-sei41 build-conteiner-oracle-sei50 build-conteiner-base-postgres build-conteiner-postgres-sei40 build-conteiner-postgres-sei41 build-conteiner-postgres-sei50 build-conteiner-solr build-conteiner-solr-9.4.0 build-conteiner-solr-9.6.1 build-conteiner-base-app build-conteiner-base-app-php8 build-conteiner-app-dev build-conteiner-app-dev-php8 build-conteiner-app-ci build-conteiner-app-ci-php8 build-conteiner-app-ci-agendador build-conteiner-app-ci-php8-agendador build-conteiner-phpmemcachedadmin-base build-conteiner-phpmemcachedadmin build-conteiner-openldap-base build-conteiner-openldap build-conteiner-haproxy-base build-conteiner-haproxy build-conteiner-phpldapadmin build-conteiner-dbadminer
build-conteiners: verificar-git-parameters build-conteiner-base-centos build-conteiner-base-rocky93 build-conteiner-memcached build-conteiner-jod build-conteiner-jod4.4.8 build-conteiner-mailcatcher build-conteiner-traefik-base build-conteiner-traefik build-conteiner-base-mariadb build-conteiner-base-mysql8 build-conteiner-mariadb-sei40 build-conteiner-mariadb-sei41 build-conteiner-mariadb-sei50 build-conteiner-mysql8-sei41 build-conteiner-mysql8-sei50 build-conteiner-base-sqlserver build-conteiner-sqlserver-sei40 build-conteiner-sqlserver-sei41 build-conteiner-sqlserver-sei50 build-conteiner-base-oracle build-conteiner-oracle-sei40 build-conteiner-oracle-sei41 build-conteiner-oracle-sei50 build-conteiner-base-postgres build-conteiner-postgres-sei40 build-conteiner-postgres-sei41 build-conteiner-postgres-sei50 build-conteiner-solr build-conteiner-solr-9.4.0 build-conteiner-solr-9.6.1 build-conteiner-base-app build-conteiner-base-app-php8 build-conteiner-app-dev build-conteiner-app-dev-php8 build-conteiner-app-ci build-conteiner-app-ci-php8 build-conteiner-app-ci-agendador build-conteiner-app-ci-php8-agendador build-conteiner-phpmemcachedadmin-base build-conteiner-phpmemcachedadmin build-conteiner-openldap-base build-conteiner-openldap build-conteiner-haproxy-base build-conteiner-haproxy build-conteiner-phpldapadmin build-conteiner-dbadminer

#*****************************************************
#*******PUBLISH CONTAINERS TARGETS********************
Expand Down Expand Up @@ -711,6 +720,8 @@ publish-container-memcached: ## publicar imagem memcached
publish-container-jod: ## publicar imagem jod
@make IMAGEMTMP=jod IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) publish-container-generic

publish-container-jod4.4.8: ## publicar imagem jod4.4.8
@make IMAGEMTMP=jod4.4.8 IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) publish-container-generic

publish-container-mailcatcher: ## publicar imagem mailcatcher
@make IMAGEMTMP=mailcatcher IMAGEMTMP_VERSAO=$(DOCKER_CONTAINER_VERSAO_PRODUTO) publish-container-generic
Expand Down Expand Up @@ -849,4 +860,4 @@ publish-container-dbadminer: ## publicar imagem dbadminer


## publish-containers: executa todos os targets de publicacao de imagem na sequencia
publish-containers: publish-container-base-centos publish-container-base-rocky93 publish-container-memcached publish-container-jod publish-container-mailcatcher publish-container-base-mariadb publish-container-mariadb-sei40 publish-container-mariadb-sei41 publish-container-mariadb-sei50 publish-container-mysql8-sei41 publish-container-mysql8-sei50 publish-container-base-sqlserver publish-container-sqlserver-sei40 publish-container-sqlserver-sei41 publish-container-sqlserver-sei50 publish-container-base-oracle publish-container-oracle-sei40 publish-container-oracle-sei41 publish-container-oracle-sei50 publish-container-base-postgres publish-container-postgres-sei40 publish-container-postgres-sei41 publish-container-postgres-sei50 publish-container-solr publish-container-solr-9.4.0 publish-container-solr-9.6.1 publish-container-base-app publish-container-base-app-php8 publish-container-app-dev publish-container-app-dev-php8 publish-container-app-ci publish-container-app-ci-php8 publish-container-app-ci-agendador publish-container-app-ci-php8-agendador publish-container-phpmemcachedadmin-base publish-container-phpmemcachedadmin publish-container-openldap-base publish-container-openldap publish-container-haproxy-base publish-container-traefik-base publish-container-traefik publish-container-haproxy publish-container-phpldapadmin publish-container-dbadminer
publish-containers: publish-container-base-centos publish-container-base-rocky93 publish-container-memcached publish-container-jod publish-container-jod4.4.8 publish-container-mailcatcher publish-container-base-mariadb publish-container-mariadb-sei40 publish-container-mariadb-sei41 publish-container-mariadb-sei50 publish-container-mysql8-sei41 publish-container-mysql8-sei50 publish-container-base-sqlserver publish-container-sqlserver-sei40 publish-container-sqlserver-sei41 publish-container-sqlserver-sei50 publish-container-base-oracle publish-container-oracle-sei40 publish-container-oracle-sei41 publish-container-oracle-sei50 publish-container-base-postgres publish-container-postgres-sei40 publish-container-postgres-sei41 publish-container-postgres-sei50 publish-container-solr publish-container-solr-9.4.0 publish-container-solr-9.6.1 publish-container-base-app publish-container-base-app-php8 publish-container-app-dev publish-container-app-dev-php8 publish-container-app-ci publish-container-app-ci-php8 publish-container-app-ci-agendador publish-container-app-ci-php8-agendador publish-container-phpmemcachedadmin-base publish-container-phpmemcachedadmin publish-container-openldap-base publish-container-openldap publish-container-haproxy-base publish-container-traefik-base publish-container-traefik publish-container-haproxy publish-container-phpldapadmin publish-container-dbadminer
6 changes: 3 additions & 3 deletions containers/app-php8/app-ci-php8/assets/conf/ConfiguracaoSEI.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ public function getArrConfiguracoes()
'Manutencao' => array(
'Ativada' => false,
'Usuarios' => array('siglaUsuario1/siglaOrgao1', 'siglaUsuario2/siglaOrgao2'),
'Mensagem' => 'Sistema em Manuten��o',
'Detalhes' => 'Previs�o de retorno at� as <b>XXhs.</b>'
'Mensagem' => 'Sistema em Manutenção',
'Detalhes' => 'Previsão de retorno até as <b>XXhs.</b>'
),

'hCaptcha' => array(
Expand All @@ -107,7 +107,7 @@ public function getArrConfiguracoes()
'Score' => 0.5
),

'JODConverter' => array('Servidor' => 'http://jod:8080/converter/service'),
'JODConverter' => array('Servidor' => 'http://jod:8080/conversion?format=pdf'),

'Solr' => array(
'Servidor' => getenv('APP_SOLR_URL'),
Expand Down
13 changes: 11 additions & 2 deletions containers/app-php8/app-ci-php8/assets/scripts-e-automatizadores/entrypoint-atualizador.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,7 @@ if [ "$MODULO_ESTATISTICAS_INSTALAR" == "true" ]; then

cd /sei-modulos/mod-sei-estatisticas
git pull || true
git pull --tags || true

cp -Rf /sei-modulos/mod-sei-estatisticas /opt/sei/web/modulos/

Expand Down Expand Up @@ -522,6 +523,7 @@ if [ "$MODULO_REST_INSTALAR" == "true" ]; then
rm -rf /opt/sei/web/modulos/mod-wssei/
cd /sei-modulos/mod-wssei
git pull || true
git pull --tags || true

cp -Rf /sei-modulos/mod-wssei /opt/sei/web/modulos/
cd /opt/sei/web/modulos/mod-wssei/
Expand Down Expand Up @@ -598,6 +600,7 @@ if [ "$MODULO_RESPOSTA_INSTALAR" == "true" ]; then
cd /sei-modulos/mod-sei-resposta
git remote set-url origin https://${GITUSER_REPO_MODULOS:-dummy}:${GITPASS_REPO_MODULOS:-dummy}@github.com/pengovbr/mod-sei-resposta.git
git pull || true
git pull --tags || true

cp -Rf /sei-modulos/mod-sei-resposta /opt/sei/web/modulos/
cd /opt/sei/web/modulos/mod-sei-resposta/
Expand Down Expand Up @@ -678,6 +681,7 @@ if [ "$MODULO_GESTAODOCUMENTAL_INSTALAR" == "true" ]; then
cd /opt/sei/web/modulos/mod-gestao-documental/
git remote set-url origin https://${GITUSER_REPO_MODULOS:-dummy}:${GITPASS_REPO_MODULOS:-dummy}@github.com/pengovbr/mod-gestao-documental.git
git pull || true
git pull --tags || true

git checkout $MODULO_GESTAODOCUMENTAL_VERSAO
echo "Versao do Gestao Documental eh agora: $MODULO_GESTAODOCUMENTAL_VERSAO"
Expand Down Expand Up @@ -774,6 +778,7 @@ if [ "$MODULO_LOGINUNICO_INSTALAR" == "true" ]; then
cd /opt/sei/web/modulos/mod-sei-loginunico/
git remote set-url origin https://${GITUSER_REPO_MODULOS:-dummy}:${GITPASS_REPO_MODULOS:-dummy}@github.com/pengovbr/mod-sei-loginunico.git
git pull || true
git pull --tags || true
git checkout $MODULO_LOGINUNICO_VERSAO
echo "Versao do LoginÚnico é agora: $MODULO_LOGINUNICO_VERSAO"

Expand Down Expand Up @@ -865,8 +870,9 @@ if [ "$MODULO_ASSINATURAVANCADA_INSTALAR" == "true" ]; then
cd /opt/sei/web/modulos
cp -R /sei-modulos/mod-sei-assinatura-avancada .
cd mod-sei-assinatura-avancada/
git remote set-url origin https://${GITUSER_REPO_MODULOS:-dummy}:${GITPASS_REPO_MODULOS:-dummy}@github.com/pengovbr/mod-sei-assinatura-avancada.git
git pull || true
git remote set-url origin https://${GITUSER_REPO_MODULOS:-dummy}:${GITPASS_REPO_MODULOS:-dummy}@github.com/pengovbr/mod-sei-assinatura-avancada.git
git pull || true
git pull --tags || true
git checkout $MODULO_ASSINATURAVANCADA_VERSAO
echo "Versao do LoginUnico eh agora: $MODULO_ASSINATURAVANCADA_VERSAO"

Expand Down Expand Up @@ -956,6 +962,7 @@ if [ "$MODULO_PEN_INSTALAR" == "true" ]; then

cd /sei-modulos/mod-sei-pen
git pull || true
git pull --tags || true

cd /opt/sei/web/modulos
cp -R /sei-modulos/mod-sei-pen mod-sei-pen
Expand Down Expand Up @@ -1094,6 +1101,7 @@ if [ "$MODULO_PI_INSTALAR" == "true" ]; then

cd /sei-modulos/mod-sei-protocolo-integrado
git pull || true
git pull --tags || true

cd /opt/sei/web/modulos
cp -R /sei-modulos/mod-sei-protocolo-integrado mod-sei-protocolo-integrado
Expand Down Expand Up @@ -1172,6 +1180,7 @@ if [ "$MODULO_INCOM_INSTALAR" == "true" ]; then
cd /sei-modulos/mod-sei-incom
git remote set-url origin https://${GITUSER_REPO_MODULOS:-dummy}:${GITPASS_REPO_MODULOS:-dummy}@github.com/pengovbr/mod-sei-incom.git
git pull || true
git pull --tags || true

cd /opt/sei/web/modulos
cp -R /sei-modulos/mod-sei-incom mod-sei-incom
Expand Down
67 changes: 56 additions & 11 deletions containers/app-php8/app-dev-php8/assets/scripts-e-automatizadores/ConfiguracaoSEI.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,12 @@ public function getArrConfiguracoes(){
'NomeSistema' => 'SEI',
'NomeSistemaComplemento' => SEI_VERSAO,
'LogoMenu' => '',
'OrgaoTopoJanela' => 'S',
'Login' => true,
'Ouvidoria' => true,
'PublicacaoInterna' => true,
'UsuariosExternos' => true,
'ValidacaoDocumentos' => true,
'ConsultaProcessual' => true
),

'BancoSEI' => array(
Expand All @@ -63,15 +68,25 @@ public function getArrConfiguracoes(){
'PesquisaCaseInsensitive' => false,
),

// 'BancoAuditoriaSEI' => array(
// 'Servidor' => getenv('DATABASE_HOST'),
// 'Porta' => getenv('DATABASE_PORT'),
// 'Banco' => getenv('SEI_DATABASE_NAME'),
// 'Usuario' => getenv('SEI_DATABASE_USER'),
// 'Senha' => getenv('SEI_DATABASE_PASSWORD'),
// 'Tipo' => getenv('DATABASE_TYPE'), //MySql, SqlServer ou Oracle
// 'PesquisaCaseInsensitive' => false,
// ),
/*
'BancoAuditoriaSEI' => array(
'Servidor' => '[servidor BD]',
'Porta' => '',
'Banco' => '',
'Usuario' => '',
'Senha' => '',
'Tipo' => ''), //MySql, SqlServer, Oracle ou PostgreSql
*/

/*
'BancoReplicaSEI' => array(
'Servidor' => '[servidor BD]',
'Porta' => '',
'Banco' => '',
'Usuario' => '',
'Senha' => '',
'Tipo' => ''), //MySql, SqlServer, Oracle ou PostgreSql
*/

'CacheSEI' => array(
'Servidor' => 'memcached',
Expand All @@ -89,6 +104,34 @@ public function getArrConfiguracoes(){
'NumMaxProtocolosConsulta' => 100, //Número máximo de protocolos do processo que serão retornados quando outra instituição consultar pelo SEI Federação (acima deste valor será realizada paginação).
'NumMaxAndamentosConsulta' => 100, //Número máximo de andamentos do processo que serão retornados quando outra instituição consultar pelo SEI Federação (acima deste valor será realizada paginação).
),

'Manutencao' => array(
'Ativada' => false,
'Usuarios' => array('siglaUsuario1/siglaOrgao1', 'siglaUsuario2/siglaOrgao2'),
'Mensagem' => 'Sistema em Manutenção',
'Detalhes' => 'Previsão de retorno até as <b>XXhs.</b>'
),

'hCaptcha' => array(
'ChaveSecreta' => '',
'ChaveSite' => ''
),

'ReCaptchaV2' => array(
'ChaveSecreta' => '',
'ChaveSite' => ''
),

'ReCaptchaV3' => array(
'ChaveSecreta' => '',
'ChaveSite' => '',
'Score' => 0.5
),

'Cloudflare' => array(
'ChaveSecreta' => '',
'ChaveSite' => ''
),

'XSS' => array(
'NivelVerificacao' => 'A', //B=Básico, A=Avançado, N=Nenhum
Expand Down Expand Up @@ -120,6 +163,8 @@ public function getArrConfiguracoes(){

'Solr' => array(
'Servidor' => 'http://solr:8983/solr',
'Usuario' => 'sei',
'Senha' => 'SolrSei123$',
'CoreProtocolos' => 'sei-protocolos',
'CoreBasesConhecimento' => 'sei-bases-conhecimento',
'CorePublicacoes' => 'sei-publicacoes',
Expand All @@ -129,7 +174,7 @@ public function getArrConfiguracoes(){
),

'JODConverter' => array(
'Servidor' => 'http://jod/converter/service'
'Servidor' => 'http://jod:8080/conversion?format=pdf'
),

'InfraMail' => array(
Expand Down
Loading

0 comments on commit 8cc7f26

Please sign in to comment.