diff --git a/composer.json b/composer.json index d6e287069091b2644c173b408ec4b2e122a34e29..103b47596e0da3ed1b83371a389bcfb4363f5963 100644 --- a/composer.json +++ b/composer.json @@ -9,12 +9,13 @@ ], "require": { "php": "^7.1.0", - "robmorgan/phinx": "^0.10.6", - "siu-toba/framework": "3.1.1", - "siu/instalador": "^1.3", + "robmorgan/phinx": "^0.11.1", + "siu-toba/framework": "^3.2.1", + "siu/instalador": "^1.8.0", "siu/toba-db": "^1.0.3", "siu-toba/jasper": "5.6.1", - "fzaninotto/faker": "^1.8" + "fzaninotto/faker": "^1.8", + "siu/arai-cli": "~2.7.2", }, "require-dev": { "phpunit/phpunit": "^4.5.0", diff --git a/docker/util/Makefile.db b/docker/util/Makefile.db index e10ce21a7e0ea83d8120d0a72d09f9a6e3467289..b5918ebc1f9ca4f3fc11cd4e6f164c608d507362 100644 --- a/docker/util/Makefile.db +++ b/docker/util/Makefile.db @@ -55,6 +55,15 @@ dumpear-base: ## Genera un backup de la base de datos DB_NAME en el path LOCAL_D recrear-base: eliminar-base crear-base cargar-base convertir-base ## Elimina, crea, carga y convierte una base +toba-regenerar: ## Regenera los metadatos del proyecto ( TOBA ) + @echo "Regenerando los metadatos " + ./docker-cmd.sh ./bin/toba proyecto regenerar -i desarrollo -p ${APP}; + @echo "Listo" ; + +toba-exportar: ## Exporta los metadatos del proyecto ( TOBA ) + @echo "Exportando los metadatos " + ./docker-cmd.sh ./bin/toba proyecto exportar -i desarrollo -p ${APP}; + @echo "Listo" ; ## Contenedor de pgadmin4 download-image-pgadmin: diff --git a/docker/util/Makefile.jasper b/docker/util/Makefile.jasper new file mode 100644 index 0000000000000000000000000000000000000000..9db1362265ff986684e7cde475e9f1a4c2618541 --- /dev/null +++ b/docker/util/Makefile.jasper @@ -0,0 +1,9 @@ +jasper-start: ## Ejecutar el servidor de reportes (Jasper Reports) + @echo "Iniciando Servidor de Reportes para Yeruti... " + $(SHOW_DEBUG)docker exec -it $(INSTANCIA_APP) start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/yeruti-reportes.pid --exec /usr/bin/java -- -Duser.language=es -Duser.country=AR -jar $(DIR_APP_DOCKER)/vendor/siu-toba/jasper/JavaBridge/WEB-INF/lib/JavaBridge.jar SERVLET_LOCAL:8081 5 /var/log/yeruti_reportes.log ; + @echo "Listo" ; + +jasper-stop: ## Detiene la ejecucion del servidor de reportes (Jasper Reports) + @echo "Deteniendo Servidor de Reportes para Yeruti... " + $(SHOW_DEBUG)docker exec -it $(INSTANCIA_APP) start-stop-daemon --oknodo --stop --pidfile /var/run/yeruti-reportes.pid ; + @echo "Listo" ; diff --git a/phinx.php b/phinx.php index fb6990e91a4daa52f69a7ba8d0d792d27cbc5480..dd568e8dff3e02bf7bfec87b12017003ffd30cf3 100644 --- a/phinx.php +++ b/phinx.php @@ -8,17 +8,16 @@ if (file_exists(__DIR__."/../../autoload.php")) { include_once $pathAutoload; -if (is_file(__DIR__.'/docker/dev/config.env')) { - $instalador = new Dotenv\Dotenv(__DIR__.'/', 'docker/dev/config.env'); - $instalador->overload(); +if(is_file(__DIR__.'/docker/dev/config.env')){ + $dotenv = \Dotenv\Dotenv::create(__DIR__.'/', 'docker/dev/config.env'); + $dotenv->load(); } -if (is_file(__DIR__.'/instalador.env')) { - $instalador = new Dotenv\Dotenv(__DIR__.'/', 'instalador.env'); - $instalador->overload(); +if(is_file(__DIR__.'/instalador.env')){ + $dotenv = \Dotenv\Dotenv::create(__DIR__.'/', 'instalador.env'); + $dotenv->load(); } - return array( "paths" => array( "migrations" => __DIR__."/db/migrations/*", @@ -39,3 +38,5 @@ return array( ] ) ); + +