diff --git a/httpd/Dockerfile b/httpd/Dockerfile index 1f39aed..a015ff7 100644 --- a/httpd/Dockerfile +++ b/httpd/Dockerfile @@ -4,6 +4,7 @@ # Container preparado e configurado para uso em desenvolvimento e testes ################################################################################ +#TODO: Migrar para container oficial do PHP 5.6 (5.6-alpine) FROM centos:centos6 MAINTAINER Guilherme Andrade Del Cantoni diff --git a/jod/Dockerfile b/jod/Dockerfile index 450f640..1ca3dda 100644 --- a/jod/Dockerfile +++ b/jod/Dockerfile @@ -4,6 +4,7 @@ # Container preparado e configurado para uso em desenvolvimento e testes ################################################################################ +#TODO: Migrar para container oficial do java-7 (7-jdk-alpine) FROM centos:centos7 MAINTAINER Guilherme Andrade Del Cantoni diff --git a/mysql/sei-db-ref-executivo b/mysql/sei-db-ref-executivo index 892e3ac..ba442b8 160000 --- a/mysql/sei-db-ref-executivo +++ b/mysql/sei-db-ref-executivo @@ -1 +1 @@ -Subproject commit 892e3acb0fc25d2dce9adb418a1f467156cd97d1 +Subproject commit ba442b8761cdf08792ef3da7000cf31fd785bf15 diff --git a/oracle/install.sh b/oracle/install.sh index 5b92cae..c6280ce 100644 --- a/oracle/install.sh +++ b/oracle/install.sh @@ -10,6 +10,8 @@ export NLS_LANG=PORTUGUESE_BRAZIL.WE8MSWIN1252 # Inicialização do servidor bash /usr/sbin/startup.sh +sleep 15 + # 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 892e3ac..ba442b8 160000 --- a/oracle/sei-db-ref-executivo +++ b/oracle/sei-db-ref-executivo @@ -1 +1 @@ -Subproject commit 892e3acb0fc25d2dce9adb418a1f467156cd97d1 +Subproject commit ba442b8761cdf08792ef3da7000cf31fd785bf15 diff --git a/solr/Dockerfile b/solr/Dockerfile index 5408c8b..697fd04 100644 --- a/solr/Dockerfile +++ b/solr/Dockerfile @@ -4,6 +4,7 @@ # Container preparado e configurado para uso em desenvolvimento e testes ################################################################################ +#TODO: Migrar para container oficial do Java 8 (8-jdk-alpine) FROM centos:centos7 MAINTAINER Guilherme Andrade Del Cantoni diff --git a/sqlserver/assets/restore.sql b/sqlserver/assets/restore.sql index 252bd0a..b63f132 100644 --- a/sqlserver/assets/restore.sql +++ b/sqlserver/assets/restore.sql @@ -1,11 +1,21 @@ -RESTORE DATABASE [sip] FROM DISK = N'/tmp/sip_sqlserver.bak' WITH FILE = 1, NOUNLOAD, REPLACE, STATS = 5, MOVE 'sip' TO '/var/opt/mssql/data/sip.mdf', MOVE 'sip_log' TO '/var/opt/mssql/data/sip_log.ldf' +-- TODO: Padronizar datafiles da base de dados em SQL Server +RESTORE DATABASE [sei] FROM DISK = N'/tmp/sei_sqlserver.bak' WITH FILE = 1, NOUNLOAD, REPLACE, STATS = 5, +MOVE 'gedoc' TO '/var/opt/mssql/data/sei_data.mdf', +MOVE 'SEI_data3' TO '/var/opt/mssql/data/sei_data1.ndf', +MOVE 'SEI_data4' TO '/var/opt/mssql/data/sei_data2.ndf', +MOVE 'SEI_log2' TO '/var/opt/mssql/data/sei_data3.ndf', +MOVE 'Sei_Log3' TO '/var/opt/mssql/data/sei_data4.ndf', +MOVE 'gedoc_log' TO '/var/opt/mssql/data/sei_1og.ldf' GO -RESTORE DATABASE [sei] FROM DISK = N'/tmp/sei_sqlserver.bak' WITH FILE = 1, NOUNLOAD, REPLACE, STATS = 5, MOVE 'sei' TO '/var/opt/mssql/data/sei.mdf', MOVE 'sei_log' TO '/var/opt/mssql/data/sei_log.ldf' +-- TODO: Padronizar datafiles da base de dados em SQL Server +RESTORE DATABASE [sip] FROM DISK = N'/tmp/sip_sqlserver.bak' WITH FILE = 1, NOUNLOAD, REPLACE, STATS = 5, +MOVE 'sip_Data' TO '/var/opt/mssql/data/sip_data.mdf', +MOVE 'sip_Log' TO '/var/opt/mssql/data/sip_log.ldf' GO -USE SEI; +USE sei; GO CREATE LOGIN sei_user @@ -24,7 +34,7 @@ GO delete from auditoria_protocolo; GO -USE SIP; +USE sip; GO CREATE LOGIN sip_user diff --git a/sqlserver/sei-db-ref-executivo b/sqlserver/sei-db-ref-executivo index 892e3ac..ba442b8 160000 --- a/sqlserver/sei-db-ref-executivo +++ b/sqlserver/sei-db-ref-executivo @@ -1 +1 @@ -Subproject commit 892e3acb0fc25d2dce9adb418a1f467156cd97d1 +Subproject commit ba442b8761cdf08792ef3da7000cf31fd785bf15 diff --git a/update-containers.sh b/update-containers.sh index c1872aa..1ccd8c5 100755 --- a/update-containers.sh +++ b/update-containers.sh @@ -9,17 +9,17 @@ vagrant destroy #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 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 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 mysql docker build -t sei3_mysql-5.6 . @@ -33,53 +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:$VERSAO_CONTAINERS -#cd .. - -#docker push guilhermeadc/sei3_solr-6.1:$VERSAO_CONTAINERS -#docker push guilhermeadc/sei3_jod-2.2.2:$VERSAO_CONTAINERS +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 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:$VERSAO_CONTAINERS +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_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 exit 0 -~ -~ - - -- libgit2 0.21.2