Allow for docker customization

Author: nolanpro

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

src/DockerExecutorJavaServiceProvider.php

@@ -28,19 +28,33 @@ public function register()
     public function boot()
     {
         \Artisan::command('docker-executor-java:install', function () {
-            // nothing to do here
+            // Copy the default custom dockerfile to the storage folder
+            copy(
+                __DIR__ . '/../storage/docker-build-config/Dockerfile-java',
+                storage_path("docker-build-config/Dockerfile-java")
+            );
+
+            // Restart the workers so they know about the new supported language
+            \Artisan::call('horizon:terminate');
+
+            // Build the base image that `executor-instance-php` inherits from
+            system("docker build -t processmaker4/executor-java:latest " . __DIR__ . '/..');
+
+            // 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');
         });
 
         $config = [
             'name' => 'Java',
             'runner' => 'JavaRunner',
             'mime_type' => 'application/java',
-            'image' => env('SCRIPTS_JAVA_IMAGE', 'processmaker4/executor-java'),
+            'image' => env('SCRIPTS_JAVA_IMAGE', 'processmaker4/executor-instance-java:v1.0.0'),
             'options' => [
                 'invokerPackage' => "ProcessMaker_Client",
                 'modelPackage' => "ProcessMaker_Model",
                 'apiPackage' => "ProcessMaker_Api",
-            ]
+            ],
+            'init_dockerfile' => "FROM processmaker4/executor-java:latest\nARG SDK_DIR\n",
         ];
         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;
     }
 

storage/docker-build-config/Dockerfile-java

@@ -0,0 +1,5 @@
+# Install the processmaker4 SDK
+COPY $SDK_DIR /opt/executor/sdk-java
+WORKDIR /opt/executor/sdk-java
+RUN mvn clean install
+WORKDIR /opt/executor