diff --git a/.gitmodules b/.gitmodules
index a52298b..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "mysql/sei-db-ref-executivo"]
- path = mysql/sei-db-ref-executivo
- branch = sei-v3.0.0
- url = http://softwarepublico.gov.br/gitlab/mp/sei-db-ref-executivo.git
diff --git a/Vagrantfile b/Vagrantfile
index cd46385..a3a770a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -13,7 +13,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Necessário permissões de root para utilizar a porta 80 (> 1024)
config.vm.network :forwarded_port, guest: 80, host: 80 # SIP e SEI (Apache)
config.vm.network :forwarded_port, guest: 3306, host: 3306 # Banco de Dados (Mysql)
- config.vm.network :forwarded_port, guest: 8080, host: 8080 # Jod Converter (Tomcat)
+ #config.vm.network :forwarded_port, guest: 8080, host: 8080 # Jod Converter (Tomcat)
config.vm.network :forwarded_port, guest: 8983, host: 8983 # Solr Indexer (Jetty)
config.vm.network :forwarded_port, guest: 1080, host: 1080 # MailCatcher
@@ -35,7 +35,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
docker.build_image "/mnt/sei/ops/sei", args: "-t 'processoeletronico/sei'"
docker.build_image "/mnt/sei/ops/memcached", args: "-t 'processoeletronico/memcached'"
docker.build_image "/mnt/sei/ops/fakesmtp", args: "-t 'processoeletronico/fakesmtp'"
- docker.build_image "/mnt/sei/ops/jod", args: "-t 'processoeletronico/jod'"
+ #docker.build_image "/mnt/sei/ops/jod", args: "-t 'processoeletronico/jod'"
# docker run -d --name smtp -p 1080:1080 schickling/mailcatcher:latest
docker.run "smtp", image: "processoeletronico/fakesmtp",
@@ -59,17 +59,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Container do Jod desativado por questões de otimização
# docker run -d --name jod -p 8080:8080 processoeletronico/jod:latest
- docker.run "jod", image: "processoeletronico/jod:latest",
- daemonize: true,
- args: "-p 8080:8080"
+ #docker.run "jod", image: "processoeletronico/jod:latest",
+ # daemonize: true,
+ # args: "-p 8080:8080"
# docker run -d --name sei -p 80:80 --link solr:solr --link db:db --link memcached:memcached --link smtp:smtp -v /mnt/sei/src:/opt processoeletronico/sei:latest
docker.run "sei", image: "processoeletronico/sei:latest",
daemonize: true,
- args: "-p 80:80 --link db:db --link solr:solr --link memcached:memcached --link smtp:smtp --link jod:jod -v /mnt/sei/src:/opt"
+ args: "-p 80:80 --link db:db --link solr:solr --link memcached:memcached --link smtp:smtp -v /mnt/sei/src:/opt"
end
# Inicialização dos containers em caso de reinicialização da máquina host
# A inicialização é realizada de forma sequencial para evitar conflito no mapeamento de volumes no Docker
- config.vm.provision "shell", run: "always", inline: "docker restart jod && docker restart solr && docker restart memcached && docker restart smtp && docker restart db && docker restart sei"
+ #config.vm.provision "shell", run: "always", inline: "docker restart solr && docker restart memcached && docker restart smtp && docker restart db && docker restart sei"
end
diff --git a/Vagrantfile_Distrib b/Vagrantfile_Distrib
index 5e19889..db51ba4 100644
--- a/Vagrantfile_Distrib
+++ b/Vagrantfile_Distrib
@@ -23,11 +23,11 @@ Vagrant.configure(2) do |config|
# Necessário permissões de root para utilizar a porta 80 (> 1024)
config.vm.network :forwarded_port, guest: 80, host: 80 # SIP e SEI (Apache)
config.vm.network :forwarded_port, guest: 3306, host: 3306 # Banco de Dados (Mysql)
- config.vm.network :forwarded_port, guest: 8080, host: 8080 # Jod Converter (Tomcat)
+ #config.vm.network :forwarded_port, guest: 8080, host: 8080 # Jod Converter (Tomcat)
config.vm.network :forwarded_port, guest: 8983, host: 8983 # Solr Indexer (Jetty)
config.vm.network :forwarded_port, guest: 1080, host: 1080 # MailCatcher
# Inicialização dos containers em caso de reinicialização da máquina host
- config.vm.provision "shell", run: "always", inline: "docker restart jod && docker restart solr && docker restart memcached && docker restart smtp && docker restart db && docker restart sei"
+ config.vm.provision "shell", run: "always", inline: "docker restart solr && docker restart memcached && docker restart smtp && docker restart db && docker restart sei"
end
diff --git a/mysql/Dockerfile b/mysql/Dockerfile
index 54a03b4..484079e 100644
--- a/mysql/Dockerfile
+++ b/mysql/Dockerfile
@@ -3,7 +3,7 @@
############################################################
# Definição da imagem de base para o CentOS 6.X
-FROM mysql/mysql-server:5.7
+FROM mysql/mysql-server:5.6
# Autor e mantenedor do container
MAINTAINER PEN - Processo Eletrônico Nacional
@@ -20,5 +20,5 @@ COPY sei-db-ref-executivo/mysql/sei_3_0_0_BD_Ref_Exec.sql /tmp/2-sei_mysql.sql
COPY sei-db-ref-executivo/mysql/sip_3_0_0_BD_Ref_Exec.sql /tmp/3-sip_mysql.sql
COPY 4-posinstall.sql /tmp/4-posinstall.sql
-RUN bash /install.sh
+#RUN bash /install.sh
diff --git a/mysql/sei-db-ref-executivo b/mysql/sei-db-ref-executivo
deleted file mode 160000
index e5851bf..0000000
--- a/mysql/sei-db-ref-executivo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e5851bf0ea9172129d8c8edf9d702c94418bbf05
diff --git a/sei-db-ref-executivo b/sei-db-ref-executivo
new file mode 160000
index 0000000..3949e4b
--- /dev/null
+++ b/sei-db-ref-executivo
@@ -0,0 +1 @@
+Subproject commit 3949e4b5abbc4060ffb9d78441289e4f43eaeac9
diff --git a/sei/install.sh b/sei/install.sh
index abe8f9e..e0b0416 100644
--- a/sei/install.sh
+++ b/sei/install.sh
@@ -4,15 +4,15 @@ set -e
yum install -y epel-release && yum -y update
+yum -y install httpd24u mysql56u memcached openssl wget curl unzip gcc java-1.7.0-openjdk libxml2 crontabs
+
+# Instalação do PHP e demais extenções necessárias para o projeto
wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
wget https://centos6.iuscommunity.org/ius-release.rpm
rpm -Uvh ius-release*.rpm
yum -y update
-yum -y install httpd24u mysql56u memcached openssl wget curl unzip gcc java-1.7.0-openjdk libxml2 crontabs
-
-# Instalação do PHP e demais extenções necessárias para o projeto
yum -y install php56u php56u-common php56u-cli php56u-pear php56u-bcmath php56u-gd php56u-gmp php56u-imap php56u-intl php56u-ldap php56u-mbstring php56u-mysqli \
php56u-odbc php56u-pdo php56u-pecl-apc php56u-pspell php56u-zlib php56u-snmp php56u-soap php56u-xml php56u-xmlrpc php56u-zts php56u-devel \
php56u-pecl-apc-devel php56u-pecl-memcache php56u-calendar php56u-shmop php56u-intl php56u-mcrypt php56u-pecl-xdebug
diff --git a/sei/sei.conf b/sei/sei.conf
index 7a03732..9adba6e 100644
--- a/sei/sei.conf
+++ b/sei/sei.conf
@@ -25,13 +25,13 @@ Alias "/infra_js" "/opt/infra/infra_js"
# Bloqueia acesso à qualquer arquivo ou diretório externo ao DocumentRoot
AllowOverride None
- Require all denied
+ # Require all denied
AllowOverride None
Options None
- Require all granted
+ # Require all granted
--
libgit2 0.21.2