diff --git a/Vagrantfile b/Vagrantfile index a206f1e..feb9e46 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -24,9 +24,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.synced_folder "../sei", "/mnt/sei/src", mount_options: ["dmode=777", "fmode=777"] # Configurações padrão da máquina virtual host - # TODO: Reduzir a quantidade de memória utilizada para testes config.vm.provider "virtualbox" do |vb| - vb.customize ["modifyvm", :id, "--memory", "2048", "--usb", "off", "--audio", "none"] + vb.customize ["modifyvm", :id, "--memory", "4096", "--usb", "off", "--audio", "none"] end # Provisionamento da máquina virtual responsável por manter os containers do Docker diff --git a/Vagrantfile_Distrib b/Vagrantfile_Distrib index 7f7e4df..c9ef881 100644 --- a/Vagrantfile_Distrib +++ b/Vagrantfile_Distrib @@ -34,9 +34,9 @@ Vagrant.configure(2) do |config| # Configuração do redirecionamento entre Máquina Virtual e Host # 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: 1521, host: 1521 # Banco de Dados (Oracle) config.vm.network :forwarded_port, guest: 1433, host: 1433 # Banco de Dados (SQL Server) + 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: 8983, host: 8983 # Solr Indexer (Jetty) config.vm.network :forwarded_port, guest: 1080, host: 1080 # MailCatcher diff --git a/mysql/install.sh b/mysql/install.sh index 227ddc1..7abcaa7 100644 --- a/mysql/install.sh +++ b/mysql/install.sh @@ -30,7 +30,6 @@ mysql -e "GRANT ALL PRIVILEGES ON sei.* TO 'sei_user'@'%'" sei # Restauração dos bancos de dados mysql sei < /tmp/sei_mysql.sql mysql sip < /tmp/sip_mysql.sql -rm -f /tmp/sei_mysql.sql /tmp/sip_mysql.sql # Atualização dos parâmetros do SEI e do SIP mysql -e "update orgao set sigla='ABC', descricao='ORGAO ABC' where id_orgao=0;" sip diff --git a/mysql/sei-db-ref-executivo b/mysql/sei-db-ref-executivo index ba442b8..0ed4e5c 160000 --- a/mysql/sei-db-ref-executivo +++ b/mysql/sei-db-ref-executivo @@ -1 +1 @@ -Subproject commit ba442b8761cdf08792ef3da7000cf31fd785bf15 +Subproject commit 0ed4e5c58e400fd1e5026b99dd03731e6937df96 diff --git a/oracle/Dockerfile b/oracle/Dockerfile index 4222503..d014704 100644 --- a/oracle/Dockerfile +++ b/oracle/Dockerfile @@ -4,7 +4,7 @@ # Container preparado e configurado para uso em desenvolvimento e testes ################################################################################ -FROM wnameless/oracle-xe-11g +FROM wnameless/oracle-xe-11g:16.04 MAINTAINER Guilherme Andrade Del Cantoni ############################# INÍCIO DA INSTALACAO ############################# diff --git a/oracle/assets/pre-install.sql b/oracle/assets/pre-install.sql index 6c4e7c2..d5d809c 100644 --- a/oracle/assets/pre-install.sql +++ b/oracle/assets/pre-install.sql @@ -8,8 +8,8 @@ ALTER DATABASE NATIONAL CHARACTER SET INTERNAL_USE AL16UTF16; SHUTDOWN IMMEDIATE; STARTUP; -CREATE TABLESPACE SEI DATAFILE '/u01/app/oracle/oradata/XE/sei.dbf' SIZE 20M AUTOEXTEND ON; -CREATE TABLESPACE SIP DATAFILE '/u01/app/oracle/oradata/XE/sip.dbf' SIZE 20M AUTOEXTEND ON; +CREATE TABLESPACE SEI DATAFILE '/u01/app/oracle/oradata/XE/sei.dbf' SIZE 50M AUTOEXTEND ON; +CREATE TABLESPACE SIP DATAFILE '/u01/app/oracle/oradata/XE/sip.dbf' SIZE 50M AUTOEXTEND ON; CREATE USER sei IDENTIFIED BY sei_user; CREATE USER sip IDENTIFIED BY sip_user; diff --git a/oracle/install.sh b/oracle/install.sh index c6280ce..994e93c 100644 --- a/oracle/install.sh +++ b/oracle/install.sh @@ -8,9 +8,7 @@ export ORACLE_SID=XE export NLS_LANG=PORTUGUESE_BRAZIL.WE8MSWIN1252 # Inicialização do servidor -bash /usr/sbin/startup.sh - -sleep 15 +/usr/sbin/startup.sh # Configuração do character set e outros parâmetros iniciais sqlplus sys/oracle as sysdba @"/tmp/pre-install.sql" diff --git a/oracle/sei-db-ref-executivo b/oracle/sei-db-ref-executivo index ba442b8..0ed4e5c 160000 --- a/oracle/sei-db-ref-executivo +++ b/oracle/sei-db-ref-executivo @@ -1 +1 @@ -Subproject commit ba442b8761cdf08792ef3da7000cf31fd785bf15 +Subproject commit 0ed4e5c58e400fd1e5026b99dd03731e6937df96 diff --git a/sqlserver/install.sh b/sqlserver/install.sh index 4fb21b2..e3d7995 100644 --- a/sqlserver/install.sh +++ b/sqlserver/install.sh @@ -6,10 +6,10 @@ export ACCEPT_EULA=Y export SA_PASSWORD='yourStrong(!)Password' # Instalação do FreeTDS para acesso ao SQL Server - apt-get -y update && apt-get -y install libodbc1 freetds-dev freetds-bin +apt-get -y update && apt-get -y install libodbc1 freetds-dev freetds-bin /opt/mssql/bin/sqlservr.sh & -sleep 10 +sleep 20 tsql -S localhost -U sa -P 'yourStrong(!)Password' < /tmp/restore.sql diff --git a/sqlserver/sei-db-ref-executivo b/sqlserver/sei-db-ref-executivo index ba442b8..0ed4e5c 160000 --- a/sqlserver/sei-db-ref-executivo +++ b/sqlserver/sei-db-ref-executivo @@ -1 +1 @@ -Subproject commit ba442b8761cdf08792ef3da7000cf31fd785bf15 +Subproject commit 0ed4e5c58e400fd1e5026b99dd03731e6937df96 diff --git a/update-containers.sh b/update-containers.sh index 1ccd8c5..c0927f9 100755 --- a/update-containers.sh +++ b/update-containers.sh @@ -3,29 +3,29 @@ set -e VERSAO_CONTAINERS='1.0' -vagrant destroy +#vagrant destroy #docker stop $(docker ps -q) #docker rm $(docker ps -a -q) #docker rmi --force $(docker images -q) -cd solr -docker build -t sei3_solr-6.1 . -docker tag sei3_solr-6.1 guilhermeadc/sei3_solr-6.1:latest -docker tag sei3_solr-6.1 guilhermeadc/sei3_solr-6.1:$VERSAO_CONTAINERS -cd .. +#cd solr +#docker build -t sei3_solr-6.1 . +#docker tag sei3_solr-6.1 guilhermeadc/sei3_solr-6.1:latest +#docker tag sei3_solr-6.1 guilhermeadc/sei3_solr-6.1:$VERSAO_CONTAINERS +#cd .. -cd jod -docker build -t sei3_jod-2.2.2 . -docker tag sei3_jod-2.2.2 guilhermeadc/sei3_jod-2.2.2:latest -docker tag sei3_jod-2.2.2 guilhermeadc/sei3_jod-2.2.2:$VERSAO_CONTAINERS -cd .. +#cd jod +#docker build -t sei3_jod-2.2.2 . +#docker tag sei3_jod-2.2.2 guilhermeadc/sei3_jod-2.2.2:latest +#docker tag sei3_jod-2.2.2 guilhermeadc/sei3_jod-2.2.2:$VERSAO_CONTAINERS +#cd .. -cd mysql -docker build -t sei3_mysql-5.6 . -docker tag sei3_mysql-5.6 guilhermeadc/sei3_mysql-5.6:latest -docker tag sei3_mysql-5.6 guilhermeadc/sei3_mysql-5.6:1.1 -cd .. +#cd mysql +#docker build -t sei3_mysql-5.6 . +#docker tag sei3_mysql-5.6 guilhermeadc/sei3_mysql-5.6:latest +#docker tag sei3_mysql-5.6 guilhermeadc/sei3_mysql-5.6:1.2 +#cd .. cd oracle docker build -t sei3_oracle-11g . @@ -33,49 +33,49 @@ docker tag sei3_oracle-11g guilhermeadc/sei3_oracle-11g:latest docker tag sei3_oracle-11g guilhermeadc/sei3_oracle-11g:1.1 cd .. -cd httpd -docker build -t sei3_httpd-2.4 . -docker tag sei3_httpd-2.4 guilhermeadc/sei3_httpd-2.4:latest -docker tag sei3_httpd-2.4 guilhermeadc/sei3_httpd-2.4:$VERSAO_CONTAINERS -cd .. - -cd mailcatcher -docker build -t sei3_mailcatcher . -docker tag sei3_mailcatcher guilhermeadc/sei3_mailcatcher:latest -docker tag sei3_mailcatcher guilhermeadc/sei3_mailcatcher:$VERSAO_CONTAINERS -cd .. - -cd memcached -docker build -t sei3_memcached . -docker tag sei3_memcached guilhermeadc/sei3_memcached:latest -docker tag sei3_memcached guilhermeadc/sei3_memcached:$VERSAO_CONTAINERS -cd .. - -cd sqlserver -docker build -t sei3_sqlserver-2016 . -docker tag sei3_sqlserver-2016 guilhermeadc/sei3_sqlserver-2016:latest -docker tag sei3_sqlserver-2016 guilhermeadc/sei3_sqlserver-2016:1.1 -cd .. - -docker push guilhermeadc/sei3_solr-6.1:$VERSAO_CONTAINERS -docker push guilhermeadc/sei3_jod-2.2.2:$VERSAO_CONTAINERS -docker push guilhermeadc/sei3_mysql-5.6:1.1 +#cd httpd +#docker build -t sei3_httpd-2.4 . +#docker tag sei3_httpd-2.4 guilhermeadc/sei3_httpd-2.4:latest +#docker tag sei3_httpd-2.4 guilhermeadc/sei3_httpd-2.4:$VERSAO_CONTAINERS +#cd .. + +#cd mailcatcher +#docker build -t sei3_mailcatcher . +#docker tag sei3_mailcatcher guilhermeadc/sei3_mailcatcher:latest +#docker tag sei3_mailcatcher guilhermeadc/sei3_mailcatcher:$VERSAO_CONTAINERS +#cd .. + +#cd memcached +#docker build -t sei3_memcached . +#docker tag sei3_memcached guilhermeadc/sei3_memcached:latest +#docker tag sei3_memcached guilhermeadc/sei3_memcached:$VERSAO_CONTAINERS +#cd .. + +#cd sqlserver +#docker build -t sei3_sqlserver-2016 . +#docker tag sei3_sqlserver-2016 guilhermeadc/sei3_sqlserver-2016:latest +#docker tag sei3_sqlserver-2016 guilhermeadc/sei3_sqlserver-2016:1.1 +#cd .. + +#docker push guilhermeadc/sei3_solr-6.1:$VERSAO_CONTAINERS +#docker push guilhermeadc/sei3_jod-2.2.2:$VERSAO_CONTAINERS +#docker push guilhermeadc/sei3_mysql-5.6:1.2 docker push guilhermeadc/sei3_oracle-11g:1.1 -docker push guilhermeadc/sei3_httpd-2.4:$VERSAO_CONTAINERS -docker push guilhermeadc/sei3_mailcatcher:$VERSAO_CONTAINERS -docker push guilhermeadc/sei3_memcached:$VERSAO_CONTAINERS -docker push guilhermeadc/sei3_sqlserver-2016:1.1 - -docker push guilhermeadc/sei3_solr-6.1:latest -docker push guilhermeadc/sei3_jod-2.2.2:latest -docker push guilhermeadc/sei3_mysql-5.6:latest +#docker push guilhermeadc/sei3_httpd-2.4:$VERSAO_CONTAINERS +#docker push guilhermeadc/sei3_mailcatcher:$VERSAO_CONTAINERS +#docker push guilhermeadc/sei3_memcached:$VERSAO_CONTAINERS +#docker push guilhermeadc/sei3_sqlserver-2016:1.1 + +#docker push guilhermeadc/sei3_solr-6.1:latest +#docker push guilhermeadc/sei3_jod-2.2.2:latest +#docker push guilhermeadc/sei3_mysql-5.6:latest docker push guilhermeadc/sei3_oracle-11g:latest -docker push guilhermeadc/sei3_httpd-2.4:latest -docker push guilhermeadc/sei3_mailcatcher:latest -docker push guilhermeadc/sei3_memcached:latest -docker push guilhermeadc/sei3_sqlserver-2016:latest +#docker push guilhermeadc/sei3_httpd-2.4:latest +#docker push guilhermeadc/sei3_mailcatcher:latest +#docker push guilhermeadc/sei3_memcached:latest +#docker push guilhermeadc/sei3_sqlserver-2016:latest -vagrant up +#vagrant up exit 0 -- libgit2 0.21.2