Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
sdk
.php-cs-fixer.php
.php-cs-fixer.cache
18 changes: 10 additions & 8 deletions src/DockerExecutorJavaServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,22 @@

namespace ProcessMaker\Package\DockerExecutorJava;

use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\ServiceProvider;
use ProcessMaker\Models\ScriptExecutor;
use ProcessMaker\Package\Packages\Events\PackageEvent;
use ProcessMaker\Package\DockerExecutorJava\Listeners\PackageListener;
use ProcessMaker\Package\Packages\Events\PackageEvent;
use ProcessMaker\Traits\PluginServiceProviderTrait;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\ServiceProvider;

class DockerExecutorJavaServiceProvider extends ServiceProvider
{
use PluginServiceProviderTrait;

const version = '1.0.0'; // Required for PluginServiceProviderTrait

public function register() {}
public function register()
{
}

/**
* After all service provider's register methods have been called, your boot method
Expand Down Expand Up @@ -48,12 +50,12 @@ public function boot()
'package_version' => self::version,
'runner' => 'JavaRunner',
'options' => [
'invokerPackage' => "ProcessMaker_Client",
'modelPackage' => "ProcessMaker_Model",
'apiPackage' => "ProcessMaker_Api",
'invokerPackage' => 'ProcessMaker_Client',
'modelPackage' => 'ProcessMaker_Model',
'apiPackage' => 'ProcessMaker_Api',
],
'init_dockerfile' => [
"ARG SDK_DIR",
'ARG SDK_DIR',
'COPY $SDK_DIR /opt/executor/sdk-java',
'WORKDIR /opt/executor/sdk-java',
'RUN mvn clean install',
Expand Down
13 changes: 8 additions & 5 deletions src/Listeners/PackageListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,23 @@ class PackageListener
* @param PackageEvent $event
* @return mixed
*/
public function handle(PackageEvent $event){
public function handle(PackageEvent $event)
{
$composer = json_decode(file_get_contents(__DIR__ . '/../../composer.json'), true);
$expires_on = null;
if(in_array('ionCube Loader', get_loaded_extensions()) && ioncube_file_info())
$expires_on = Carbon::createFromTimestamp(ioncube_file_info()['FILE_EXPIRY'], config('app.timezone'))->format(DateTime::ISO8601);

if (in_array('ionCube Loader', get_loaded_extensions()) && ioncube_file_info()) {
$expires_on = Carbon::createFromTimestamp(ioncube_file_info()['FILE_EXPIRY'], config('app.timezone'))->format(DateTime::ISO8601);
}

$infoPackage = [
'name' => $composer['name'],
'friendly_name' => isset($composer['friendly_name']) ? $composer['friendly_name'] : '',
'description' => $composer['description'],
'version' => $composer['version'],
'expires_on' => $expires_on
'expires_on' => $expires_on,
];
$event->packages->push($infoPackage);

return $event->packages->last();
}
}
1 change: 1 addition & 0 deletions src/ScriptRunners/JavaRunner.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public function config($code, array $dockerConfig)
$dockerConfig['image'] = config('script-runners.java.image');
$dockerConfig['command'] = '/bin/sh /opt/executor/run.sh';
$dockerConfig['inputs']['/opt/executor/Script.java'] = $code;

return $dockerConfig;
}
}