Download as
Browse Code »

Commit 95a6b4d0fae6420711866d47a6a304b1bd1ce41f

Authored by Guilherme Andrade Del Cantoni
1 parent 4550ea0c
Exists in sei-v3.0.0-oracle-dockerimages

Correções finais no provisionamento da base Oracle

Showing 11 changed files with 67 additions and 71 deletions   Show diff stats
@@ -24,9 +24,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| @@ -24,9 +24,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
24 config.vm.synced_folder "../sei", "/mnt/sei/src", mount_options: ["dmode=777", "fmode=777"] 24 config.vm.synced_folder "../sei", "/mnt/sei/src", mount_options: ["dmode=777", "fmode=777"]
25 25
26 # Configurações padrão da máquina virtual host 26 # Configurações padrão da máquina virtual host
27 - # TODO: Reduzir a quantidade de memória utilizada para testes  
28 config.vm.provider "virtualbox" do |vb| 27 config.vm.provider "virtualbox" do |vb|
29 - vb.customize ["modifyvm", :id, "--memory", "2048", "--usb", "off", "--audio", "none"] 28 + vb.customize ["modifyvm", :id, "--memory", "4096", "--usb", "off", "--audio", "none"]
30 end 29 end
31 30
32 # Provisionamento da máquina virtual responsável por manter os containers do Docker 31 # Provisionamento da máquina virtual responsável por manter os containers do Docker
Vagrantfile_Distrib
  Diff comments   View file @95a6b4d
@@ -34,9 +34,9 @@ Vagrant.configure(2) do |config| @@ -34,9 +34,9 @@ Vagrant.configure(2) do |config|
34 # Configuração do redirecionamento entre Máquina Virtual e Host 34 # Configuração do redirecionamento entre Máquina Virtual e Host
35 # Necessário permissões de root para utilizar a porta 80 (> 1024) 35 # Necessário permissões de root para utilizar a porta 80 (> 1024)
36 config.vm.network :forwarded_port, guest: 80, host: 80 # SIP e SEI (Apache) 36 config.vm.network :forwarded_port, guest: 80, host: 80 # SIP e SEI (Apache)
37 - config.vm.network :forwarded_port, guest: 3306, host: 3306 # Banco de Dados (Mysql)  
38 config.vm.network :forwarded_port, guest: 1521, host: 1521 # Banco de Dados (Oracle) 37 config.vm.network :forwarded_port, guest: 1521, host: 1521 # Banco de Dados (Oracle)
39 config.vm.network :forwarded_port, guest: 1433, host: 1433 # Banco de Dados (SQL Server) 38 config.vm.network :forwarded_port, guest: 1433, host: 1433 # Banco de Dados (SQL Server)
  39 + config.vm.network :forwarded_port, guest: 3306, host: 3306 # Banco de Dados (Mysql)
40 config.vm.network :forwarded_port, guest: 8080, host: 8080 # Jod Converter (Tomcat) 40 config.vm.network :forwarded_port, guest: 8080, host: 8080 # Jod Converter (Tomcat)
41 config.vm.network :forwarded_port, guest: 8983, host: 8983 # Solr Indexer (Jetty) 41 config.vm.network :forwarded_port, guest: 8983, host: 8983 # Solr Indexer (Jetty)
42 config.vm.network :forwarded_port, guest: 1080, host: 1080 # MailCatcher 42 config.vm.network :forwarded_port, guest: 1080, host: 1080 # MailCatcher
mysql/install.sh
  Diff comments   View file @95a6b4d
@@ -30,7 +30,6 @@ mysql -e "GRANT ALL PRIVILEGES ON sei.* TO 'sei_user'@'%'" sei @@ -30,7 +30,6 @@ mysql -e "GRANT ALL PRIVILEGES ON sei.* TO 'sei_user'@'%'" sei
30 # Restauração dos bancos de dados 30 # Restauração dos bancos de dados
31 mysql sei < /tmp/sei_mysql.sql 31 mysql sei < /tmp/sei_mysql.sql
32 mysql sip < /tmp/sip_mysql.sql 32 mysql sip < /tmp/sip_mysql.sql
33 -rm -f /tmp/sei_mysql.sql /tmp/sip_mysql.sql  
34 33
35 # Atualização dos parâmetros do SEI e do SIP 34 # Atualização dos parâmetros do SEI e do SIP
36 mysql -e "update orgao set sigla='ABC', descricao='ORGAO ABC' where id_orgao=0;" sip 35 mysql -e "update orgao set sigla='ABC', descricao='ORGAO ABC' where id_orgao=0;" sip
mysql/sei-db-ref-executivo
  Diff comments   View file @95a6b4d
1 -Subproject commit ba442b8761cdf08792ef3da7000cf31fd785bf15 1 +Subproject commit 0ed4e5c58e400fd1e5026b99dd03731e6937df96
oracle/Dockerfile
  Diff comments   View file @95a6b4d
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 # Container preparado e configurado para uso em desenvolvimento e testes 4 # Container preparado e configurado para uso em desenvolvimento e testes
5 ################################################################################ 5 ################################################################################
6 6
7 -FROM wnameless/oracle-xe-11g 7 +FROM wnameless/oracle-xe-11g:16.04
8 MAINTAINER Guilherme Andrade Del Cantoni <guilherme.cantoni@planejamento.gov.br> 8 MAINTAINER Guilherme Andrade Del Cantoni <guilherme.cantoni@planejamento.gov.br>
9 9
10 ############################# INÍCIO DA INSTALACAO ############################# 10 ############################# INÍCIO DA INSTALACAO #############################
oracle/assets/pre-install.sql
  Diff comments   View file @95a6b4d
@@ -8,8 +8,8 @@ ALTER DATABASE NATIONAL CHARACTER SET INTERNAL_USE AL16UTF16; @@ -8,8 +8,8 @@ ALTER DATABASE NATIONAL CHARACTER SET INTERNAL_USE AL16UTF16;
8 SHUTDOWN IMMEDIATE; 8 SHUTDOWN IMMEDIATE;
9 STARTUP; 9 STARTUP;
10 10
11 -CREATE TABLESPACE SEI DATAFILE '/u01/app/oracle/oradata/XE/sei.dbf' SIZE 20M AUTOEXTEND ON;  
12 -CREATE TABLESPACE SIP DATAFILE '/u01/app/oracle/oradata/XE/sip.dbf' SIZE 20M AUTOEXTEND ON; 11 +CREATE TABLESPACE SEI DATAFILE '/u01/app/oracle/oradata/XE/sei.dbf' SIZE 50M AUTOEXTEND ON;
  12 +CREATE TABLESPACE SIP DATAFILE '/u01/app/oracle/oradata/XE/sip.dbf' SIZE 50M AUTOEXTEND ON;
13 13
14 CREATE USER sei IDENTIFIED BY sei_user; 14 CREATE USER sei IDENTIFIED BY sei_user;
15 CREATE USER sip IDENTIFIED BY sip_user; 15 CREATE USER sip IDENTIFIED BY sip_user;
oracle/install.sh
  Diff comments   View file @95a6b4d
@@ -8,9 +8,7 @@ export ORACLE_SID=XE @@ -8,9 +8,7 @@ export ORACLE_SID=XE
8 export NLS_LANG=PORTUGUESE_BRAZIL.WE8MSWIN1252 8 export NLS_LANG=PORTUGUESE_BRAZIL.WE8MSWIN1252
9 9
10 # Inicialização do servidor 10 # Inicialização do servidor
11 -bash /usr/sbin/startup.sh  
12 -  
13 -sleep 15 11 +/usr/sbin/startup.sh
14 12
15 # Configuração do character set e outros parâmetros iniciais 13 # Configuração do character set e outros parâmetros iniciais
16 sqlplus sys/oracle as sysdba @"/tmp/pre-install.sql" 14 sqlplus sys/oracle as sysdba @"/tmp/pre-install.sql"
oracle/sei-db-ref-executivo
  Diff comments   View file @95a6b4d
1 -Subproject commit ba442b8761cdf08792ef3da7000cf31fd785bf15 1 +Subproject commit 0ed4e5c58e400fd1e5026b99dd03731e6937df96
sqlserver/install.sh
  Diff comments   View file @95a6b4d
@@ -6,10 +6,10 @@ export ACCEPT_EULA=Y @@ -6,10 +6,10 @@ export ACCEPT_EULA=Y
6 export SA_PASSWORD='yourStrong(!)Password' 6 export SA_PASSWORD='yourStrong(!)Password'
7 7
8 # Instalação do FreeTDS para acesso ao SQL Server 8 # Instalação do FreeTDS para acesso ao SQL Server
9 - apt-get -y update && apt-get -y install libodbc1 freetds-dev freetds-bin 9 +apt-get -y update && apt-get -y install libodbc1 freetds-dev freetds-bin
10 10
11 /opt/mssql/bin/sqlservr.sh & 11 /opt/mssql/bin/sqlservr.sh &
12 -sleep 10 12 +sleep 20
13 13
14 tsql -S localhost -U sa -P 'yourStrong(!)Password' < /tmp/restore.sql 14 tsql -S localhost -U sa -P 'yourStrong(!)Password' < /tmp/restore.sql
15 15
sqlserver/sei-db-ref-executivo
  Diff comments   View file @95a6b4d
1 -Subproject commit ba442b8761cdf08792ef3da7000cf31fd785bf15 1 +Subproject commit 0ed4e5c58e400fd1e5026b99dd03731e6937df96
update-containers.sh
  Diff comments   View file @95a6b4d
@@ -3,29 +3,29 @@ set -e @@ -3,29 +3,29 @@ set -e
3 3
4 VERSAO_CONTAINERS='1.0' 4 VERSAO_CONTAINERS='1.0'
5 5
6 -vagrant destroy 6 +#vagrant destroy
7 7
8 #docker stop $(docker ps -q) 8 #docker stop $(docker ps -q)
9 #docker rm $(docker ps -a -q) 9 #docker rm $(docker ps -a -q)
10 #docker rmi --force $(docker images -q) 10 #docker rmi --force $(docker images -q)
11 11
12 -cd solr  
13 -docker build -t sei3_solr-6.1 .  
14 -docker tag sei3_solr-6.1 guilhermeadc/sei3_solr-6.1:latest  
15 -docker tag sei3_solr-6.1 guilhermeadc/sei3_solr-6.1:$VERSAO_CONTAINERS  
16 -cd .. 12 +#cd solr
  13 +#docker build -t sei3_solr-6.1 .
  14 +#docker tag sei3_solr-6.1 guilhermeadc/sei3_solr-6.1:latest
  15 +#docker tag sei3_solr-6.1 guilhermeadc/sei3_solr-6.1:$VERSAO_CONTAINERS
  16 +#cd ..
17 17
18 -cd jod  
19 -docker build -t sei3_jod-2.2.2 .  
20 -docker tag sei3_jod-2.2.2 guilhermeadc/sei3_jod-2.2.2:latest  
21 -docker tag sei3_jod-2.2.2 guilhermeadc/sei3_jod-2.2.2:$VERSAO_CONTAINERS  
22 -cd .. 18 +#cd jod
  19 +#docker build -t sei3_jod-2.2.2 .
  20 +#docker tag sei3_jod-2.2.2 guilhermeadc/sei3_jod-2.2.2:latest
  21 +#docker tag sei3_jod-2.2.2 guilhermeadc/sei3_jod-2.2.2:$VERSAO_CONTAINERS
  22 +#cd ..
23 23
24 -cd mysql  
25 -docker build -t sei3_mysql-5.6 .  
26 -docker tag sei3_mysql-5.6 guilhermeadc/sei3_mysql-5.6:latest  
27 -docker tag sei3_mysql-5.6 guilhermeadc/sei3_mysql-5.6:1.1  
28 -cd .. 24 +#cd mysql
  25 +#docker build -t sei3_mysql-5.6 .
  26 +#docker tag sei3_mysql-5.6 guilhermeadc/sei3_mysql-5.6:latest
  27 +#docker tag sei3_mysql-5.6 guilhermeadc/sei3_mysql-5.6:1.2
  28 +#cd ..
29 29
30 cd oracle 30 cd oracle
31 docker build -t sei3_oracle-11g . 31 docker build -t sei3_oracle-11g .
@@ -33,49 +33,49 @@ docker tag sei3_oracle-11g guilhermeadc/sei3_oracle-11g:latest @@ -33,49 +33,49 @@ docker tag sei3_oracle-11g guilhermeadc/sei3_oracle-11g:latest
33 docker tag sei3_oracle-11g guilhermeadc/sei3_oracle-11g:1.1 33 docker tag sei3_oracle-11g guilhermeadc/sei3_oracle-11g:1.1
34 cd .. 34 cd ..
35 35
36 -cd httpd  
37 -docker build -t sei3_httpd-2.4 .  
38 -docker tag sei3_httpd-2.4 guilhermeadc/sei3_httpd-2.4:latest  
39 -docker tag sei3_httpd-2.4 guilhermeadc/sei3_httpd-2.4:$VERSAO_CONTAINERS  
40 -cd ..  
41 -  
42 -cd mailcatcher  
43 -docker build -t sei3_mailcatcher .  
44 -docker tag sei3_mailcatcher guilhermeadc/sei3_mailcatcher:latest  
45 -docker tag sei3_mailcatcher guilhermeadc/sei3_mailcatcher:$VERSAO_CONTAINERS  
46 -cd ..  
47 -  
48 -cd memcached  
49 -docker build -t sei3_memcached .  
50 -docker tag sei3_memcached guilhermeadc/sei3_memcached:latest  
51 -docker tag sei3_memcached guilhermeadc/sei3_memcached:$VERSAO_CONTAINERS  
52 -cd ..  
53 -  
54 -cd sqlserver  
55 -docker build -t sei3_sqlserver-2016 .  
56 -docker tag sei3_sqlserver-2016 guilhermeadc/sei3_sqlserver-2016:latest  
57 -docker tag sei3_sqlserver-2016 guilhermeadc/sei3_sqlserver-2016:1.1  
58 -cd ..  
59 -  
60 -docker push guilhermeadc/sei3_solr-6.1:$VERSAO_CONTAINERS  
61 -docker push guilhermeadc/sei3_jod-2.2.2:$VERSAO_CONTAINERS  
62 -docker push guilhermeadc/sei3_mysql-5.6:1.1 36 +#cd httpd
  37 +#docker build -t sei3_httpd-2.4 .
  38 +#docker tag sei3_httpd-2.4 guilhermeadc/sei3_httpd-2.4:latest
  39 +#docker tag sei3_httpd-2.4 guilhermeadc/sei3_httpd-2.4:$VERSAO_CONTAINERS
  40 +#cd ..
  41 +
  42 +#cd mailcatcher
  43 +#docker build -t sei3_mailcatcher .
  44 +#docker tag sei3_mailcatcher guilhermeadc/sei3_mailcatcher:latest
  45 +#docker tag sei3_mailcatcher guilhermeadc/sei3_mailcatcher:$VERSAO_CONTAINERS
  46 +#cd ..
  47 +
  48 +#cd memcached
  49 +#docker build -t sei3_memcached .
  50 +#docker tag sei3_memcached guilhermeadc/sei3_memcached:latest
  51 +#docker tag sei3_memcached guilhermeadc/sei3_memcached:$VERSAO_CONTAINERS
  52 +#cd ..
  53 +
  54 +#cd sqlserver
  55 +#docker build -t sei3_sqlserver-2016 .
  56 +#docker tag sei3_sqlserver-2016 guilhermeadc/sei3_sqlserver-2016:latest
  57 +#docker tag sei3_sqlserver-2016 guilhermeadc/sei3_sqlserver-2016:1.1
  58 +#cd ..
  59 +
  60 +#docker push guilhermeadc/sei3_solr-6.1:$VERSAO_CONTAINERS
  61 +#docker push guilhermeadc/sei3_jod-2.2.2:$VERSAO_CONTAINERS
  62 +#docker push guilhermeadc/sei3_mysql-5.6:1.2
63 docker push guilhermeadc/sei3_oracle-11g:1.1 63 docker push guilhermeadc/sei3_oracle-11g:1.1
64 -docker push guilhermeadc/sei3_httpd-2.4:$VERSAO_CONTAINERS  
65 -docker push guilhermeadc/sei3_mailcatcher:$VERSAO_CONTAINERS  
66 -docker push guilhermeadc/sei3_memcached:$VERSAO_CONTAINERS  
67 -docker push guilhermeadc/sei3_sqlserver-2016:1.1  
68 -  
69 -docker push guilhermeadc/sei3_solr-6.1:latest  
70 -docker push guilhermeadc/sei3_jod-2.2.2:latest  
71 -docker push guilhermeadc/sei3_mysql-5.6:latest 64 +#docker push guilhermeadc/sei3_httpd-2.4:$VERSAO_CONTAINERS
  65 +#docker push guilhermeadc/sei3_mailcatcher:$VERSAO_CONTAINERS
  66 +#docker push guilhermeadc/sei3_memcached:$VERSAO_CONTAINERS
  67 +#docker push guilhermeadc/sei3_sqlserver-2016:1.1
  68 +
  69 +#docker push guilhermeadc/sei3_solr-6.1:latest
  70 +#docker push guilhermeadc/sei3_jod-2.2.2:latest
  71 +#docker push guilhermeadc/sei3_mysql-5.6:latest
72 docker push guilhermeadc/sei3_oracle-11g:latest 72 docker push guilhermeadc/sei3_oracle-11g:latest
73 -docker push guilhermeadc/sei3_httpd-2.4:latest  
74 -docker push guilhermeadc/sei3_mailcatcher:latest  
75 -docker push guilhermeadc/sei3_memcached:latest  
76 -docker push guilhermeadc/sei3_sqlserver-2016:latest 73 +#docker push guilhermeadc/sei3_httpd-2.4:latest
  74 +#docker push guilhermeadc/sei3_mailcatcher:latest
  75 +#docker push guilhermeadc/sei3_memcached:latest
  76 +#docker push guilhermeadc/sei3_sqlserver-2016:latest
77 77
78 -vagrant up 78 +#vagrant up
79 79
80 exit 0 80 exit 0
81 81