diff --git a/.gitignore b/.gitignore index 146d846..ddcb631 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ src/vendor /sdk .php-cs-fixer.php .php-cs-fixer.cache +.envrc +.idea \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index d78e9c6..f30bfab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2.8-cli-stretch +FROM php:7.3.33-cli-buster # Copy over our PHP libraries/runtime COPY ./src /opt/executor @@ -10,7 +10,17 @@ WORKDIR /opt/executor RUN curl -sS https://getcomposer.org/installer -o composer-setup.php RUN php composer-setup.php --install-dir=/usr/local/bin --filename=composer -RUN echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list +RUN echo "deb https://archive.debian.org/debian buster main" > /etc/apt/sources.list + RUN apt-get update && apt-get install -y git zip unzip -RUN composer install \ No newline at end of file +# Download and set the bundle +RUN curl -kLo /usr/local/share/cacert.pem https://curl.se/ca/cacert.pem +ENV CURL_CA_BUNDLE=/usr/local/share/cacert.pem +ENV SSL_CERT_FILE=/usr/local/share/cacert.pem + +# Apply to PHP +RUN echo "openssl.cafile=/usr/local/share/cacert.pem" >> /usr/local/etc/php/php.ini \ + && echo "curl.cainfo=/usr/local/share/cacert.pem" >> /usr/local/etc/php/php.ini + +RUN composer install diff --git a/composer.json b/composer.json index 9878221..f5e22d3 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "processmaker/docker-executor-php", "friendly_name": "PHP Docker Executor", "description": "PHP script executor for processmaker 4", - "version": "1.3.0", + "version": "1.4.3", "minimum-stability": "dev", "license": "GAGPL-3.0-or-later", "autoload": { @@ -18,4 +18,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/composer.json b/src/composer.json index b221b99..0ccc732 100644 --- a/src/composer.json +++ b/src/composer.json @@ -1,6 +1,6 @@ { "require": { - "aws/aws-sdk-php": "^3.192", + "aws/aws-sdk-php": "^3.192,<3.368", "guzzlehttp/guzzle": "~6.0" }, "require-dev": { @@ -9,5 +9,10 @@ }, "autoload": { "psr-4": {"Executor\\": "."} + }, + "config": { + "audit": { + "ignore": ["PKSA-4t1p-xpk2-nsss", "PKSA-dxyf-6n16-t87m", "PKSA-n3s6-289w-qtqb", "PKSA-z3gr-8qht-p93v"] + } } }