From 9e23c3fe63faae22764f43bb114e5f98ed2c76ed Mon Sep 17 00:00:00 2001 From: Guilherme Andrade Del Cantoni Date: Sun, 27 Nov 2016 22:06:51 -0200 Subject: [PATCH] Nova correção da estrutura de diretórios --- .gitmodules | 9 --------- Vagrantfile | 1 + mysql/sei-db-ref-executivo | 1 - oracle/sei-db-ref-executivo | 1 - sqlserver/sei-db-ref-executivo | 1 - update-containers.sh | 17 +++++++++-------- 6 files changed, 10 insertions(+), 20 deletions(-) delete mode 160000 mysql/sei-db-ref-executivo delete mode 160000 oracle/sei-db-ref-executivo delete mode 160000 sqlserver/sei-db-ref-executivo diff --git a/.gitmodules b/.gitmodules index 78825f5..f1c7c91 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,3 @@ [submodule "mysql/sei-db-ref-executivo"] path = mysql/sei-db-ref-executivo url = http://softwarepublico.gov.br/gitlab/sei/sei-db-ref-executivo.git - branch = sei-db-ref-executivo-3.0.0_v1 -[submodule "oracle/sei-db-ref-executivo"] - path = oracle/sei-db-ref-executivo - url = http://softwarepublico.gov.br/gitlab/sei/sei-db-ref-executivo.git - branch = sei-db-ref-executivo-3.0.0_v1 -[submodule "sqlserver/sei-db-ref-executivo"] - path = sqlserver/sei-db-ref-executivo - url = http://softwarepublico.gov.br/gitlab/sei/sei-db-ref-executivo.git - branch = sei-db-ref-executivo-3.0.0_v1 diff --git a/Vagrantfile b/Vagrantfile index df6f09f..1301aae 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -13,6 +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: 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) diff --git a/mysql/sei-db-ref-executivo b/mysql/sei-db-ref-executivo deleted file mode 160000 index 3949e4b..0000000 --- a/mysql/sei-db-ref-executivo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3949e4b5abbc4060ffb9d78441289e4f43eaeac9 diff --git a/oracle/sei-db-ref-executivo b/oracle/sei-db-ref-executivo deleted file mode 160000 index 3949e4b..0000000 --- a/oracle/sei-db-ref-executivo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3949e4b5abbc4060ffb9d78441289e4f43eaeac9 diff --git a/sqlserver/sei-db-ref-executivo b/sqlserver/sei-db-ref-executivo deleted file mode 160000 index ece5b31..0000000 --- a/sqlserver/sei-db-ref-executivo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ece5b31d850d836380dd53f1cf40cb322a63999e diff --git a/update-containers.sh b/update-containers.sh index 499d1e4..9efde22 100755 --- a/update-containers.sh +++ b/update-containers.sh @@ -21,51 +21,52 @@ fi cd solr docker build -t sei3_solr-6.1 . docker tag sei3_solr-6.1 guilhermeadc/sei3_solr-6.1:latest -#docker push guilhermeadc/sei3_solr-6.1 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 push guilhermeadc/sei3_jod-2.2.2 cd .. cd mysql docker build -t sei3_mysql-5.6 . docker tag sei3_mysql-5.6 guilhermeadc/sei3_mysql-5.6:latest -#docker push guilhermeadc/sei3_mysql-5.6 cd .. cd oracle docker build -t sei3_oracle-11g . docker tag sei3_oracle-11g guilhermeadc/sei3_oracle-11g:latest -#docker push guilhermeadc/sei3_oracle-11g cd .. cd httpd docker build -t sei3_httpd-2.4 . docker tag sei3_httpd-2.4 guilhermeadc/sei3_httpd-2.4:latest -#docker push guilhermeadc/sei3_httpd-2.4 cd .. cd smtp docker build -t sei3_mailcatcher . docker tag sei3_mailcatcher guilhermeadc/sei3_mailcatcher:latest -#docker push guilhermeadc/sei3_mailcatcher cd .. cd memcached docker build -t sei3_memcached . docker tag sei3_memcached guilhermeadc/sei3_memcached:latest -#docker push guilhermeadc/sei3_memcached cd .. cd sqlserver docker build -t sei3_sqlserver-2016 . docker tag sei3_sqlserver-2016 guilhermeadc/sei3_sqlserver-2016:latest -#docker push guilhermeadc/sei3_sqlserver-2016 cd .. +#docker push guilhermeadc/sei3_solr-6.1 +#docker push guilhermeadc/sei3_jod-2.2.2 +#docker push guilhermeadc/sei3_mysql-5.6 +#docker push guilhermeadc/sei3_oracle-11g +#docker push guilhermeadc/sei3_httpd-2.4 +#docker push guilhermeadc/sei3_mailcatcher +#docker push guilhermeadc/sei3_memcached +#docker push guilhermeadc/sei3_sqlserver-2016 + vagrant up exit 0 -- libgit2 0.21.2