Merge pull request #2 from ProcessMaker/feature/1

Allow for docker customization

Author: velkymx

.gitignore

@@ -0,0 +1 @@
+sdk

Dockerfile

@@ -8,7 +8,3 @@ RUN apt-get update && apt-get install -y git-core
 
 COPY /src /opt/executor
 WORKDIR /opt/executor
-RUN if [ ! -d "sdk-java" ]; then git clone --depth 1 https://github.com/ProcessMaker/sdk-java.git; fi
-WORKDIR /opt/executor/sdk-java
-RUN mvn clean install
-WORKDIR /opt/executor

composer.json

@@ -2,7 +2,7 @@
     "name": "processmaker/docker-executor-java",
     "friendly_name": "Java Docker Executor",
     "description": "Java script executor for processmaker 4",
-    "version": "0.0.1",
+    "version": "1.0.0",
     "minimum-stability": "dev",
     "autoload": {
         "psr-4": {

src/DockerExecutorJavaServiceProvider.php

@@ -6,12 +6,13 @@
 use ProcessMaker\Traits\PluginServiceProviderTrait;
 use ProcessMaker\Package\Packages\Events\PackageEvent;
 use ProcessMaker\Package\WebEntry\Listeners\PackageListener;
+use ProcessMaker\Models\ScriptExecutor;
 
 class DockerExecutorJavaServiceProvider extends ServiceProvider
 {
     use PluginServiceProviderTrait;
 
-    const version = '0.0.1'; // Required for PluginServiceProviderTrait
+    const version = '1.0.0'; // Required for PluginServiceProviderTrait
 
     public function register()
     {
@@ -28,19 +29,37 @@ public function register()
     public function boot()
     {
         \Artisan::command('docker-executor-java:install', function () {
-            // nothing to do here
+            $scriptExecutor = ScriptExecutor::install([
+                'language' => 'java',
+                'title' => 'Java Executor',
+                'description' => 'Default Java Executor',
+            ]);
+
+            // Build the instance image. This is the same as if you were to build it from the admin UI
+            \Artisan::call('processmaker:build-script-executor java');
+            
+            // Restart the workers so they know about the new supported language
+            \Artisan::call('horizon:terminate');
         });
 
         $config = [
             'name' => 'Java',
             'runner' => 'JavaRunner',
             'mime_type' => 'application/java',
-            'image' => env('SCRIPTS_JAVA_IMAGE', 'processmaker4/executor-java'),
             'options' => [
                 'invokerPackage' => "ProcessMaker_Client",
                 'modelPackage' => "ProcessMaker_Model",
                 'apiPackage' => "ProcessMaker_Api",
-            ]
+            ],
+            'init_dockerfile' => [
+                "ARG SDK_DIR",
+                'COPY $SDK_DIR /opt/executor/sdk-java',
+                'WORKDIR /opt/executor/sdk-java',
+                'RUN mvn clean install',
+                'WORKDIR /opt/executor',
+            ],
+            'package_path' => __DIR__ . '/..',
+            'package_version' => self::version,
         ];
         config(['script-runners.java' => $config]);
 

src/ProcessMaker.java

@@ -11,6 +11,7 @@ public class ProcessMaker {
     public static ApiClient api() {
         String baseApiUrl = System.getenv("API_HOST");
         String v3Token = System.getenv("API_TOKEN");
+        String verifySsl = System.getenv("API_SSL_VERIFY");
         int connectTimeout = 60000;
         int readTimeout = 120000;
 
@@ -22,6 +23,11 @@ public static ApiClient api() {
         }
         client.setConnectTimeout(connectTimeout);
         client.setDebugging(false);
+        
+        if (verifySsl.equals("0")) {
+            client.setVerifyingSsl(false);
+        }
+
         return client;
     }