From 2bf87aa3fe95abeb80c64cdc4bca29738b78f77e Mon Sep 17 00:00:00 2001 From: guilherme.cantoni Date: Tue, 18 Nov 2014 19:48:13 -0200 Subject: [PATCH] Correção dos comandos de referência de inicialização do Docker --- Vagrantfile | 10 +++++----- sei/ConfiguracaoSEI.php | 5 ++++- sei/ConfiguracaoSip.php | 2 +- sei/Dockerfile | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 660350f..a3155a4 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -76,28 +76,28 @@ SCRIPT docker.build_image "/mnt/sei/ops/jod", args: "-t 'sei.gov/jod'" # Provisiona docker containers na máquina virtual - # docker run -d --name sei_data -v -v /mnt/sei/arquivos:/var/sei/arquivos centos:centos6 true + # docker run -it --name sei_data -v /mnt/sei/arquivos:/var/sei/arquivos centos:centos6 true docker.run "sei_data", image: "centos:centos6", daemonize: true, args: "-v /mnt/sei/arquivos:/var/sei/arquivos", cmd: "true" - # docker run -t -i --name sei_db -p 3306:3306 --rm --volumes-from se, "/mnt_data sei.gov/mysql:latest + # docker run -it --name sei_db -p 3306:3306 --rm sei.gov/mysql:latest docker.run "sei_db", image: "sei.gov/mysql:latest", daemonize: true, args: "-p 3306:3306" - # docker run -t -i --name sei_solr -p 8983:8983 --rm -v /mnt/sei/src/sei/solr:/mnt/sei/index sei.gov/solr:latest + # docker run -it --name sei_solr -p 8983:8983 --rm -v /mnt/sei/src/sei/solr:/mnt/sei/index sei.gov/solr:latest docker.run "sei_solr", image: "sei.gov/solr:latest", daemonize: true, args: "-p 8983:8983 -v /mnt/sei/src/sei/solr:/mnt/sei/index" - # docker run -t -i --name sei_jod -p 8080:8080 --rm sei.gov/jod:latest + # docker run -it --name sei_jod -p 8080:8080 --rm sei.gov/jod:latest docker.run "sei_jod", image: "sei.gov/jod:latest", daemonize: true, args: "-p 8080:8080" - # docker run -t -i --name sei_www -p 80:80 --rm --link sei_solr:solr --link sei_db:db --link sei_jod:jod -v /mnt/sei/src:/var/www/html sei.gov/sei:latest + # docker run -it --name sei_www -p 80:80 --rm --link sei_solr:solr --link sei_db:db --link sei_jod:jod -v /mnt/sei/src:/var/www/html sei.gov/sei:latest docker.run "sei_www", image: "sei.gov/sei:latest", daemonize: true, args: "-p 80:80 --link sei_db:db --link sei_solr:solr --link sei_jod:jod -v /mnt/sei/src:/var/www/html -v /mnt/sei/ops/sei:/mnt/sei/ops/sei --volumes-from sei_data" diff --git a/sei/ConfiguracaoSEI.php b/sei/ConfiguracaoSEI.php index 02bf585..3927445 100644 --- a/sei/ConfiguracaoSEI.php +++ b/sei/ConfiguracaoSEI.php @@ -33,7 +33,7 @@ class ConfiguracaoSEI extends InfraConfiguracao { 'PaginaSEI' => array( 'NomeSistema' => 'SEI', - 'NomeSistemaComplemento' => 'v2.5.1', + 'NomeSistemaComplemento' => 'v2.5.2', 'LogoMenu' => ''), 'SessaoSEI' => array( @@ -59,6 +59,9 @@ class ConfiguracaoSEI extends InfraConfiguracao { 'CacheSEI' => array( 'Servidor' => '127.0.0.1', 'Porta' => '11211'), + + // Endereço do WebService utilizado para busca de cargos e funções externas + 'RH' => array('CargoFuncao' => ''), 'JODConverter' => array('Servidor' => 'http://'.getenv("JOD_PORT_8080_TCP_ADDR").':'.getenv("JOD_PORT_8080_TCP_PORT").'/converter/service'), diff --git a/sei/ConfiguracaoSip.php b/sei/ConfiguracaoSip.php index e96b598..23684f0 100644 --- a/sei/ConfiguracaoSip.php +++ b/sei/ConfiguracaoSip.php @@ -24,7 +24,7 @@ class ConfiguracaoSip extends InfraConfiguracao { 'PaginaSip' => array( 'NomeSistema' => 'SIP', - 'NomeSistemaComplemento' => 'v2.5.1'), + 'NomeSistemaComplemento' => 'v2.5.2'), 'SessaoSip' => array( 'SiglaOrgaoSistema' => 'ABC', diff --git a/sei/Dockerfile b/sei/Dockerfile index 5ecdef9..d5e82e8 100644 --- a/sei/Dockerfile +++ b/sei/Dockerfile @@ -16,8 +16,8 @@ MAINTAINER PEN - Processo Eletrônico Nacional # Ref: http://sei.processoeletronico.gov.br/wiki/manual_de_instalacao# # Instalação do servidor web Apache 2.2, memcache e demais componentes -RUN yum -y update httpd-2.2.* mysql-5.1.* memcached openssl curl unzip gcc java-1.7.0-openjdk libxml2 && \ - yum -y install httpd-2.2.* mysql-5.1.* memcached openssl curl unzip gcc java-1.7.0-openjdk libxml2 +RUN yum -y update httpd-2.2.* mysql-5.1.* memcached openssl wget curl unzip gcc java-1.7.0-openjdk libxml2 && \ + yum -y install httpd-2.2.* mysql-5.1.* memcached openssl wget curl unzip gcc java-1.7.0-openjdk libxml2 # Configuração do charset do Apache RUN echo "AddDefaultCharset iso-8859-1" | tee -a /etc/httpd/conf/httpd.conf -- libgit2 0.21.2