Merge pull request #6 from ProcessMaker/feature/5

Build this docker image as a base image

Author: velkymx

.gitignore

@@ -1 +1,2 @@
 src/vendor
+sdk

Dockerfile

@@ -1,4 +1,3 @@
-# Bring in from PHP docker image
 FROM php:7.2.8-cli-stretch
 
 # Copy over our PHP libraries/runtime
@@ -13,19 +12,4 @@ RUN php composer-setup.php --install-dir=/usr/local/bin --filename=composer
 
 RUN apt-get update && apt-get install -y git zip unzip
 
-RUN composer install
-
-## 
-## Below is temporary until this is converted to a base image
-## 
-
-# Get the sdk repo if it doesn't exist
-RUN apt-get update && apt-get install -y git
-RUN if [ ! -d "sdk-php" ]; then git clone --depth 1 https://github.com/ProcessMaker/sdk-php.git; fi
-RUN mv sdk-php /opt/
-RUN composer config repositories.sdk-php path /opt/sdk-php
-RUN composer require ProcessMaker/sdk-php:@dev
-
-# Get the last AWS-SDK version
-RUN apt-get install zip unzip -y
-RUN composer require aws/aws-sdk-php
+RUN composer install

README.md

@@ -1,3 +1,8 @@
+# Build
+```
+docker build -t processmaker4/executor-php:latest .
+```
+
 # executor-php
 Script Task Executor Engine with PHP Runtime
 

composer.json

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

src/DockerExecutorPhpServiceProvider.php

@@ -4,39 +4,48 @@
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
 use ProcessMaker\Traits\PluginServiceProviderTrait;
+use ProcessMaker\Models\ScriptExecutor;
 
 class DockerExecutorPhpServiceProvider extends ServiceProvider
 {
     use PluginServiceProviderTrait;
 
-    const version = '0.0.1'; // Required for PluginServiceProviderTrait
+    const version = '1.0.0'; // Required for PluginServiceProviderTrait
 
     public function register()
     {
     }
 
     public function boot()
     {
-        $image = env('SCRIPTS_PHP_IMAGE', 'processmaker4/executor-php');
-        $dockerDir = sys_get_temp_dir() . "/pm4-docker-builds/php";
-        $sdkDir = $dockerDir . "/sdk";
-
         \Artisan::command('docker-executor-php:install', function () {
+            $scriptExecutor = ScriptExecutor::install([
+                'language' => 'php',
+                'title' => 'PHP Executor',
+                'description' => 'Default PHP Executor',
+                'config' => 'RUN composer require aws/aws-sdk-php'
+            ]);
+            
+            // 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 ' . $scriptExecutor->id);
+            
             // Restart the workers so they know about the new supported language
-            \Artisan::call('horizon:terminate');
+            // \Artisan::call('horizon:terminate');
         });
 
-        \Artisan::command('docker-executor-php:build-base', function () {
-            system("docker build -t processmaker4/base-php:latest " . __DIR__ . '/..');
-        });
-        
         $config = [
             'name' => 'PHP',
             'runner' => 'PhpRunner',
             'mime_type' => 'application/x-php',
-            'image' => $image,
             'options' => ['invokerPackage' => "ProcessMaker\\Client"],
-            'init_dockerfile' => "FROM processmaker4/base-php:latest\nCOPY ./sdk /opt/pm4-sdk\nRUN composer config repositories.pm4-sdk path /opt/pm4-sdk\nRUN composer require ProcessMaker/sdk-php:@dev",
+            'init_dockerfile' => [
+                'ARG SDK_DIR',
+                'COPY $SDK_DIR /opt/sdk-php',
+                'RUN composer config repositories.sdk-php path /opt/sdk-php',
+                'RUN composer require processmaker/sdk-php:@dev',
+            ],
+            'package_path' => __DIR__ . '/..',
+            'package_version' => self::version,
         ];
         config(['script-runners.php' => $config]);
 

src/bootstrap.php

@@ -35,7 +35,7 @@
     exit(SCRIPT_PATH_INVALID);
 }
 
-if (getenv('API_TOKEN') && getenv('API_HOST')) {
+if (getenv('API_TOKEN') && getenv('API_HOST') && class_exists('ProcessMaker\Client\Configuration')) {
     $api_config = new ProcessMaker\Client\Configuration();
     $api_config->setAccessToken(getenv('API_TOKEN'));
     $api_config->setHost(getenv('API_HOST'));