Merge branch 'master' of https://github.com/code-runner-2017/php-lambda-layer into development

Author: txase

.gitignore

@@ -1 +1,3 @@
 php71.zip
+php72.zip
+php73.zip

Makefile

@@ -1,7 +1,13 @@
 ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
 php71.zip:
-	docker run --rm -v $(ROOT_DIR):/opt/layer lambci/lambda:build-nodejs8.10 /opt/layer/build.sh
+	docker run --rm -e http_proxy=${http_proxy} -v $(ROOT_DIR):/opt/layer lambci/lambda:build-nodejs8.10 /opt/layer/build.sh
+
+php72.zip:
+	docker run --rm -e http_proxy=${http_proxy} -v $(ROOT_DIR):/opt/layer lambci/lambda:build-nodejs8.10 /opt/layer/build-php-remi.sh 2
+
+php73.zip:
+	docker run --rm -e http_proxy=${http_proxy} -v $(ROOT_DIR):/opt/layer lambci/lambda:build-nodejs8.10 /opt/layer/build-php-remi.sh 3
 
 upload: php71.zip
 	./upload.sh
@@ -10,4 +16,5 @@ publish: php71.zip
 	./publish.sh
 
 clean:
-	rm php71.zip
+	rm -f php71.zip php72.zip php73.zip
+

README.md

@@ -1,21 +1,21 @@
 # PHP Layer For AWS Lambda
 
-Ever wanted to run PHP websites in AWS Lambda? It's your lucky day! This Lambda Runtime Layer runs the [PHP 7.1 webserver](http://php.net/manual/en/features.commandline.webserver.php) in response to [AWS API Gateway](https://aws.amazon.com/api-gateway/) or [AWS Application Load Balancer](https://aws.amazon.com/elasticloadbalancing/features/#Details_for_Elastic_Load_Balancing_Products) requests.
+Ever wanted to run PHP websites in AWS Lambda? It's your lucky day! This Lambda Runtime Layer runs the [PHP 7.1/7.2/7.3  webserver](http://php.net/manual/en/features.commandline.webserver.php) in response to [AWS API Gateway](https://aws.amazon.com/api-gateway/) or [AWS Application Load Balancer](https://aws.amazon.com/elasticloadbalancing/features/#Details_for_Elastic_Load_Balancing_Products) requests.
 
 And, if you're looking for a great way to build serverless apps of all kinds, be sure to check out [Stackery](https://stackery.io)!
 
 This is an early iteration of the PHP runtime Layer which is not yet ready for production. Please feel free to use this Layer to learn about the Lambda Layers feature and begin experimenting with PHP functions. We welcome feedback and stay tuned for the production-ready version coming soon.
 
 ## Current Layer Version ARN
-When creating/updating a Lambda function you must specify  a specific version of the layer. This readme will be kept up to date with the latest version available. The latest available Lambda Layer Version ARN is:
+When creating/updating a Lambda function you must specify  a specific version of the layer. This readme will be kept up to date with the latest version available. The latest available Lambda Layer Version ARN for PHP 7.1 is:
 
 **arn:aws:lambda:\<region\>:887080169480:layer:php71:7**
 
 See [Releases](https://github.com/stackery/php-lambda-layer/releases) for release notes.
 
 ### Usage
 #### General Usage
-The layer runs the PHP 7.1 [PHP webserver](http://php.net/manual/en/features.commandline.webserver.php) in /var/task, the root directory of function code packages:
+The layer runs the PHP 7.* [PHP webserver](http://php.net/manual/en/features.commandline.webserver.php) in /var/task, the root directory of function code packages:
 
 ```sh
 $ php -S localhost:8000 '<handler>'
@@ -26,12 +26,14 @@ The Lambda Function Handler property specifies the location of the the script ex
 #### Configuration Files
 There are three locations where PHP configuration may be located:
 
-* Files in layer code packages located under /etc/php-7.1.d/
-* Files in function code package located under /php-7.1.d/
+* Files in layer code packages located under /etc/php-${PHP_VERSION}.d/
+* Files in function code package located under /php-${PHP_VERSION}.d/
 * php.ini located at the root of the function code package
 
+Replace ${PHP_VERSION} with '7.1', '7.2', or '7.3' according to your preferred runtime.
+
 ##### Extensions
-The following extensions are built into the layer and available in /opt/lib/php/7.1/modules:
+The following extensions are built into the layer and available in /opt/lib/php/${PHP_VERSION}/modules:
 
 ```
 bz2.so
@@ -68,7 +70,7 @@ These extensions are not loaded by default. You must add the extension to a php.
 extension=json.so
 ```
 
-Extensions can be built using the lambci/lambda:build-nodejs8.10 Docker image. It is recommended that custom extensions be provided by a separate Lambda Layer with the extension .so files placed in /lib/php/7.1/modules/ so they can be loaded alongside the built-in extensions listed above.
+Extensions can be built using the lambci/lambda:build-nodejs8.10 Docker image. It is recommended that custom extensions be provided by a separate Lambda Layer with the extension .so files placed in /lib/php/${PHP_VERSION}/modules/ so they can be loaded alongside the built-in extensions listed above.
 
 #### SAM Example
 Let's create an AWS SAM PHP application. We suggest using [Stackery](https://stackery.io) to make this super simple. It automates all the scaffolding shown below. But you may also choose to roll your own application from scratch.
@@ -149,6 +151,32 @@ Build the layer by:
 
 This will launch a Docker container that will build php71.zip.
 
+You can run `make php72.zip` and `make php73.zip` to create a layer that is based on PHP 7.2/7.3.
+
+If you are behind a proxy server, just set the environment variable `http_proxy` before
+invoking `make`, eg.:
+
+```sh
+	$ export http_proyx=http://myproxy.acme.com:8080
+	$ make php73.zip
+```
+
+### Debugging
+
+Run:
+
+```sh
+	$ docker run --rm -it -v `pwd`:/opt/layer lambci/lambda:build-nodejs8.10 /bin/bash
+```
+
+If you are on Windows, run this instead:
+
+```sh
+	> docker run --rm -it -v %cd%:/opt/layer lambci/lambda:build-nodejs8.10 /bin/bash
+```
+
+and execute manually the commands in the build.sh file.
+
 ### Disclaimer
 
 > THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
@@ -162,4 +190,4 @@ This will launch a Docker container that will build php71.zip.
 > HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 > STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 > ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-> OF THE POSSIBILITY OF SUCH DAMAGE.
+> OF THE POSSIBILITY OF SUCH DAMAGE.

bootstrap

@@ -17,11 +17,12 @@ function start_webserver() {
     case 0:
       // exec the command
       $HANDLER = getenv('_HANDLER');
+      $phpMinorVersion = PHP_MINOR_VERSION;
       $handler_components = explode('/', $HANDLER);
       $handler_filename = array_pop($handler_components);
       $handler_path = implode('/', array_merge(['/var/task'], $handler_components));
       chdir($handler_path);
-      exec("PHP_INI_SCAN_DIR=/opt/etc/php-7.1.d/:/var/task/php-7.1.d/ php -S localhost:8000 -c /var/task/php.ini -d extension_dir=/opt/lib/php/7.1/modules '$handler_filename'");
+      exec("PHP_INI_SCAN_DIR=/opt/etc/php-7.${phpMinorVersion}.d/:/var/task/php-7.${phpMinorVersion}.d/ php -S localhost:8000 -c /var/task/php.ini -d extension_dir=/opt/lib/php/7.${phpMinorVersion}/modules '$handler_filename'");
       exit;
 
     // return the child pid to parent

build-php-remi.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+PHP_MINOR_VERSION=$1
+
+echo "Building layer for PHP 7.$PHP_MINOR_VERSION - using Remi repository"
+
+yum install -y wget
+yum install -y yum-utils
+wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
+wget https://rpms.remirepo.net/enterprise/remi-release-6.rpm
+rpm -Uvh remi-release-6.rpm
+rpm -Uvh epel-release-latest-6.noarch.rpm
+
+
+yum-config-manager --enable remi-php7${PHP_MINOR_VERSION}
+
+yum install -y httpd
+yum install -y postgresql-devel
+yum install -y libargon2-devel
+
+yum install -y --disablerepo="*" --enablerepo="remi,remi-php7${PHP_MINOR_VERSION}" php php-mbstring php-pdo php-mysql php-pgsql
+
+
+mkdir /tmp/layer
+cd /tmp/layer
+cp /opt/layer/bootstrap bootstrap
+sed "s/PHP_MINOR_VERSION/${PHP_MINOR_VERSION}/g" /opt/layer/php.ini >php.ini
+
+mkdir bin
+cp /usr/bin/php bin/
+
+mkdir lib
+for lib in libncurses.so.5 libtinfo.so.5 libpcre.so.0; do
+  cp "/lib64/${lib}" lib/
+done
+
+cp /usr/lib64/libedit.so.0 lib/
+cp /usr/lib64/libargon2.so.0 lib/
+cp /usr/lib64/libpq.so.5 lib/
+
+mkdir -p lib/php/7.${PHP_MINOR_VERSION}
+cp -a /usr/lib64/php/modules lib/php/7.${PHP_MINOR_VERSION}/
+
+zip -r /opt/layer/php7${PHP_MINOR_VERSION}.zip .
+

build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-yum install -y php71-cli zip
+yum install -y php71-mbstring.x86_64 zip php71-pgsql php71-mysqli
 
 mkdir /tmp/layer
 cd /tmp/layer
@@ -16,6 +16,7 @@ for lib in libncurses.so.5 libtinfo.so.5 libpcre.so.0; do
 done
 
 cp /usr/lib64/libedit.so.0 lib/
+cp /usr/lib64/libpq.so.5 lib/
 
 cp -a /usr/lib64/php lib/
 

php.ini

@@ -1,4 +1,5 @@
-extension_dir=/opt/lib/php/7.1/modules
+extension_dir=/opt/lib/php/7.PHP_MINOR_VERSION/modules
+display_errors=On
+
 extension=curl.so
 extension=json.so
-display_errors=On