Download as
Browse Code »

Commit 10ac98a6adc89ee6f52cb10231f69da1fb617ac5

Authored by Guilherme Andrade Del Cantoni
1 parent af864d5a
Exists in sei-v3.0.0-oracle-dockerimages and in 2 other branches sei-v3.0.0, sei-v3.0.0-oracle

Ajuste no gitmodule

Showing 8 changed files with 17 additions and 21 deletions   Show diff stats
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
1 -[submodule "mysql/sei-db-ref-executivo"]  
2 - path = mysql/sei-db-ref-executivo  
3 - branch = sei-v3.0.0  
4 - url = http://softwarepublico.gov.br/gitlab/mp/sei-db-ref-executivo.git  
@@ -13,7 +13,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| @@ -13,7 +13,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
13 # Necessário permissões de root para utilizar a porta 80 (> 1024) 13 # Necessário permissões de root para utilizar a porta 80 (> 1024)
14 config.vm.network :forwarded_port, guest: 80, host: 80 # SIP e SEI (Apache) 14 config.vm.network :forwarded_port, guest: 80, host: 80 # SIP e SEI (Apache)
15 config.vm.network :forwarded_port, guest: 3306, host: 3306 # Banco de Dados (Mysql) 15 config.vm.network :forwarded_port, guest: 3306, host: 3306 # Banco de Dados (Mysql)
16 - config.vm.network :forwarded_port, guest: 8080, host: 8080 # Jod Converter (Tomcat) 16 + #config.vm.network :forwarded_port, guest: 8080, host: 8080 # Jod Converter (Tomcat)
17 config.vm.network :forwarded_port, guest: 8983, host: 8983 # Solr Indexer (Jetty) 17 config.vm.network :forwarded_port, guest: 8983, host: 8983 # Solr Indexer (Jetty)
18 config.vm.network :forwarded_port, guest: 1080, host: 1080 # MailCatcher 18 config.vm.network :forwarded_port, guest: 1080, host: 1080 # MailCatcher
19 19
@@ -35,7 +35,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| @@ -35,7 +35,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
35 docker.build_image "/mnt/sei/ops/sei", args: "-t 'processoeletronico/sei'" 35 docker.build_image "/mnt/sei/ops/sei", args: "-t 'processoeletronico/sei'"
36 docker.build_image "/mnt/sei/ops/memcached", args: "-t 'processoeletronico/memcached'" 36 docker.build_image "/mnt/sei/ops/memcached", args: "-t 'processoeletronico/memcached'"
37 docker.build_image "/mnt/sei/ops/fakesmtp", args: "-t 'processoeletronico/fakesmtp'" 37 docker.build_image "/mnt/sei/ops/fakesmtp", args: "-t 'processoeletronico/fakesmtp'"
38 - docker.build_image "/mnt/sei/ops/jod", args: "-t 'processoeletronico/jod'" 38 + #docker.build_image "/mnt/sei/ops/jod", args: "-t 'processoeletronico/jod'"
39 39
40 # docker run -d --name smtp -p 1080:1080 schickling/mailcatcher:latest 40 # docker run -d --name smtp -p 1080:1080 schickling/mailcatcher:latest
41 docker.run "smtp", image: "processoeletronico/fakesmtp", 41 docker.run "smtp", image: "processoeletronico/fakesmtp",
@@ -59,17 +59,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| @@ -59,17 +59,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
59 59
60 # Container do Jod desativado por questões de otimização 60 # Container do Jod desativado por questões de otimização
61 # docker run -d --name jod -p 8080:8080 processoeletronico/jod:latest 61 # docker run -d --name jod -p 8080:8080 processoeletronico/jod:latest
62 - docker.run "jod", image: "processoeletronico/jod:latest",  
63 - daemonize: true,  
64 - args: "-p 8080:8080" 62 + #docker.run "jod", image: "processoeletronico/jod:latest",
  63 + # daemonize: true,
  64 + # args: "-p 8080:8080"
65 65
66 # 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 66 # 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
67 docker.run "sei", image: "processoeletronico/sei:latest", 67 docker.run "sei", image: "processoeletronico/sei:latest",
68 daemonize: true, 68 daemonize: true,
69 - args: "-p 80:80 --link db:db --link solr:solr --link memcached:memcached --link smtp:smtp --link jod:jod -v /mnt/sei/src:/opt" 69 + args: "-p 80:80 --link db:db --link solr:solr --link memcached:memcached --link smtp:smtp -v /mnt/sei/src:/opt"
70 end 70 end
71 71
72 # Inicialização dos containers em caso de reinicialização da máquina host 72 # Inicialização dos containers em caso de reinicialização da máquina host
73 # A inicialização é realizada de forma sequencial para evitar conflito no mapeamento de volumes no Docker 73 # A inicialização é realizada de forma sequencial para evitar conflito no mapeamento de volumes no Docker
74 - 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" 74 + #config.vm.provision "shell", run: "always", inline: "docker restart solr && docker restart memcached && docker restart smtp && docker restart db && docker restart sei"
75 end 75 end
Vagrantfile_Distrib
  Diff comments   View file @10ac98a
@@ -23,11 +23,11 @@ Vagrant.configure(2) do |config| @@ -23,11 +23,11 @@ Vagrant.configure(2) do |config|
23 # Necessário permissões de root para utilizar a porta 80 (> 1024) 23 # Necessário permissões de root para utilizar a porta 80 (> 1024)
24 config.vm.network :forwarded_port, guest: 80, host: 80 # SIP e SEI (Apache) 24 config.vm.network :forwarded_port, guest: 80, host: 80 # SIP e SEI (Apache)
25 config.vm.network :forwarded_port, guest: 3306, host: 3306 # Banco de Dados (Mysql) 25 config.vm.network :forwarded_port, guest: 3306, host: 3306 # Banco de Dados (Mysql)
26 - config.vm.network :forwarded_port, guest: 8080, host: 8080 # Jod Converter (Tomcat) 26 + #config.vm.network :forwarded_port, guest: 8080, host: 8080 # Jod Converter (Tomcat)
27 config.vm.network :forwarded_port, guest: 8983, host: 8983 # Solr Indexer (Jetty) 27 config.vm.network :forwarded_port, guest: 8983, host: 8983 # Solr Indexer (Jetty)
28 config.vm.network :forwarded_port, guest: 1080, host: 1080 # MailCatcher 28 config.vm.network :forwarded_port, guest: 1080, host: 1080 # MailCatcher
29 29
30 # Inicialização dos containers em caso de reinicialização da máquina host 30 # Inicialização dos containers em caso de reinicialização da máquina host
31 - 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" 31 + config.vm.provision "shell", run: "always", inline: "docker restart solr && docker restart memcached && docker restart smtp && docker restart db && docker restart sei"
32 32
33 end 33 end
mysql/Dockerfile
  Diff comments   View file @10ac98a
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 ############################################################ 3 ############################################################
4 4
5 # Definição da imagem de base para o CentOS 6.X 5 # Definição da imagem de base para o CentOS 6.X
6 -FROM mysql/mysql-server:5.7 6 +FROM mysql/mysql-server:5.6
7 7
8 # Autor e mantenedor do container 8 # Autor e mantenedor do container
9 MAINTAINER PEN - Processo Eletrônico Nacional 9 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 @@ -20,5 +20,5 @@ COPY sei-db-ref-executivo/mysql/sei_3_0_0_BD_Ref_Exec.sql /tmp/2-sei_mysql.sql
20 COPY sei-db-ref-executivo/mysql/sip_3_0_0_BD_Ref_Exec.sql /tmp/3-sip_mysql.sql 20 COPY sei-db-ref-executivo/mysql/sip_3_0_0_BD_Ref_Exec.sql /tmp/3-sip_mysql.sql
21 COPY 4-posinstall.sql /tmp/4-posinstall.sql 21 COPY 4-posinstall.sql /tmp/4-posinstall.sql
22 22
23 -RUN bash /install.sh 23 +#RUN bash /install.sh
24 24
mysql/sei-db-ref-executivo
View file @af864d5
@@ -1 +0,0 @@ @@ -1 +0,0 @@
1 -Subproject commit e5851bf0ea9172129d8c8edf9d702c94418bbf05  
sei-db-ref-executivo 0 → 160000
  Diff comments   View file @10ac98a
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +Subproject commit 3949e4b5abbc4060ffb9d78441289e4f43eaeac9
sei/install.sh
  Diff comments   View file @10ac98a
@@ -4,15 +4,15 @@ set -e @@ -4,15 +4,15 @@ set -e
4 4
5 yum install -y epel-release && yum -y update 5 yum install -y epel-release && yum -y update
6 6
  7 +yum -y install httpd24u mysql56u memcached openssl wget curl unzip gcc java-1.7.0-openjdk libxml2 crontabs
  8 +
  9 +# Instalação do PHP e demais extenções necessárias para o projeto
7 wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm 10 wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
8 wget https://centos6.iuscommunity.org/ius-release.rpm 11 wget https://centos6.iuscommunity.org/ius-release.rpm
9 rpm -Uvh ius-release*.rpm 12 rpm -Uvh ius-release*.rpm
10 13
11 yum -y update 14 yum -y update
12 15
13 -yum -y install httpd24u mysql56u memcached openssl wget curl unzip gcc java-1.7.0-openjdk libxml2 crontabs  
14 -  
15 -# Instalação do PHP e demais extenções necessárias para o projeto  
16 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 \ 16 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 \
17 php56u-odbc php56u-pdo php56u-pecl-apc php56u-pspell php56u-zlib php56u-snmp php56u-soap php56u-xml php56u-xmlrpc php56u-zts php56u-devel \ 17 php56u-odbc php56u-pdo php56u-pecl-apc php56u-pspell php56u-zlib php56u-snmp php56u-soap php56u-xml php56u-xmlrpc php56u-zts php56u-devel \
18 php56u-pecl-apc-devel php56u-pecl-memcache php56u-calendar php56u-shmop php56u-intl php56u-mcrypt php56u-pecl-xdebug 18 php56u-pecl-apc-devel php56u-pecl-memcache php56u-calendar php56u-shmop php56u-intl php56u-mcrypt php56u-pecl-xdebug
@@ -25,13 +25,13 @@ Alias "/infra_js" "/opt/infra/infra_js" @@ -25,13 +25,13 @@ Alias "/infra_js" "/opt/infra/infra_js"
25 # Bloqueia acesso à qualquer arquivo ou diretório externo ao DocumentRoot 25 # Bloqueia acesso à qualquer arquivo ou diretório externo ao DocumentRoot
26 <Directory /> 26 <Directory />
27 AllowOverride None 27 AllowOverride None
28 - Require all denied 28 + # Require all denied
29 </Directory> 29 </Directory>
30 30
31 <Directory ~ "(/opt/sei/web|/opt/sip/web|/opt/infra/infra_css|/opt/infra/infra_js)" > 31 <Directory ~ "(/opt/sei/web|/opt/sip/web|/opt/infra/infra_css|/opt/infra/infra_js)" >
32 AllowOverride None 32 AllowOverride None
33 Options None 33 Options None
34 - Require all granted 34 + # Require all granted
35 </Directory> 35 </Directory>
36 36
37 </VirtualHost> 37 </VirtualHost>