Add php 8.3 and remove php 8.0 (#138)

* Add PHP 8.3

* Add PHP 8.3 rest files

* Remove php 8.0 as it is now deprecated

* use buster

* update system libraries

* remove comments used for testing

* updated postgres

* Update core/php8.3Action/CHANGELOG.md

Co-authored-by: David Grove <dgrove-oss@users.noreply.github.com>

* Update core/php8.3Action/CHANGELOG.md

Co-authored-by: David Grove <dgrove-oss@users.noreply.github.com>

---------

Co-authored-by: David Grove <dgrove-oss@users.noreply.github.com>

Author: Luke-Roy-IBM

.github/workflows/ci.yaml

@@ -88,12 +88,12 @@ jobs:
         working-directory: runtime
         run: |
           SHORT_COMMIT=$(git rev-parse --short "$GITHUB_SHA")
-          ./gradlew :core:php8.0Action:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
-          ./gradlew :core:php8.0Action:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
           ./gradlew :core:php8.1Action:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
           ./gradlew :core:php8.1Action:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
           ./gradlew :core:php8.2Action:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
           ./gradlew :core:php8.2Action:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
+          ./gradlew :core:php8.3Action:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
+          ./gradlew :core:php8.3Action:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
       - name: Push Release Images
         if: ${{ env.PUSH_RELEASE == 'true' }}
         working-directory: runtime

README.md

@@ -23,11 +23,16 @@
 
 ## PHP versions
 
-This runtime provides PHP 8.2, 8.1 and 8.0
+This runtime provides PHP 8.3, 8.2 and 8.1
 
 ### Give it a try today
 To use as a docker action
 
+PHP 8.3:
+```
+wsk action update myAction myAction.php --docker openwhisk/action-php-v8.3:latest
+```
+
 PHP 8.2:
 ```
 wsk action update myAction myAction.php --docker openwhisk/action-php-v8.2:latest
@@ -38,16 +43,16 @@ PHP 8.1:
 wsk action update myAction myAction.php --docker openwhisk/action-php-v8.1:latest
 ```
 
-PHP 8.0:
-```
-wsk action update myAction myAction.php --docker openwhisk/action-php-v8.0:latest
-```
-
 This works on any deployment of Apache OpenWhisk
 
 ### To use on deployment that contains the runtime as a kind
 To use as a kind action
 
+PHP 8.3:
+```
+wsk action update myAction myAction.php --kind php:8.3
+```
+
 PHP 8.2:
 ```
 wsk action update myAction myAction.php --kind php:8.2
@@ -58,30 +63,26 @@ PHP 8.1:
 wsk action update myAction myAction.php --kind php:8.1
 ```
 
-PHP 8.0:
-```
-wsk action update myAction myAction.php --kind php:8.0
-```
 
 
 ### Local development
 
 ```
+./gradlew core:php8.3Action:distDocker
 ./gradlew core:php8.2Action:distDocker
 ./gradlew core:php8.1Action:distDocker
-./gradlew core:php8.0Action:distDocker
 ```
-This will produce the images `whisk/action-php-v8.2` and `whisk/action-php-v8.1`, `whisk/action-php-v8.0` respectively.
+This will produce the images `whisk/action-php-v8.3`, `whisk/action-php-v8.2` and `whisk/action-php-v8.1` respectively.
 
 Build and Push image
 ```
 docker login
+./gradlew core:php8.3Action:distDocker -PdockerImagePrefix=$prefix-user -PdockerRegistry=docker.io
 ./gradlew core:php8.2Action:distDocker -PdockerImagePrefix=$prefix-user -PdockerRegistry=docker.io
 ./gradlew core:php8.1Action:distDocker -PdockerImagePrefix=$prefix-user -PdockerRegistry=docker.io
-./gradlew core:php8.0Action:distDocker -PdockerImagePrefix=$prefix-user -PdockerRegistry=docker.io
 ```
 
-Deploy OpenWhisk using ansible environment that contains the kinds `php:8.2`, `php:8.1` and `php:8.0`
+Deploy OpenWhisk using ansible environment that contains the kinds `php:8.3`, `php:8.2` and `php:8.1`
 Assuming you have OpenWhisk already deploy locally and `OPENWHISK_HOME` pointing to root directory of OpenWhisk core repository.
 
 Set `ROOTDIR` to the root directory of this repository.
@@ -106,21 +107,21 @@ wskdev fresh -t local-php
 
 To use as docker action push to your own dockerhub account
 ```
+docker tag whisk/php8.2Action $user_prefix/action-php-v8.3
+docker push $user_prefix/action-php-v8.3
+```
+```
 docker tag whisk/php8.2Action $user_prefix/action-php-v8.2
 docker push $user_prefix/action-php-v8.2
 ```
 ```
 docker tag whisk/php8.1Action $user_prefix/action-php-v8.1
 docker push $user_prefix/action-php-v8.1
 ```
-```
-docker tag whisk/php8.0Action $user_prefix/action-php-v8.0
-docker push $user_prefix/action-php-v8.0
-```
 
 Then create the action using your image from dockerhub
 ```
-wsk action update myAction myAction.php --docker $user_prefix/action-php-v8.0
+wsk action update myAction myAction.php --docker $user_prefix/action-php-v8.1
 ```
 The `$user_prefix` is usually your dockerhub user id.
 

core/php8.0Action/composer.json

@@ -17,24 +17,10 @@
 #
 -->
 
-## Apache 1.19.0
-  - No change
+## Initial Release
 
-## Apache 1.18.0
-  - Use php:8.0-cli-buster image to always pull latest patch version
-  - Golang Action loop updatetd to golang 1.20
-  - Support array result include sequence action (#120)
 
-## Apache 1.17.0
-  - Update version of PHP to 8.0.8
-  - Build actionloop from 1.16@1.18.0 (#107)
-  - Resolve akka versions explicitly. (#105, #104)
-
-## Apache 1.16.0
-Initial release
-
-- Added: PHP: 8.0.2
-- Used openwhisk-runtime-go 1.17.0 to build proxy
+- Added: PHP: 8.3.2
 - Added: PHP extensions in addition to the standard ones:
     - bcmath
     - curl
@@ -49,5 +35,5 @@ Initial release
     - zip
     - mongo
 - Added: Composer packages:
-    - [guzzlehttp/guzzle](https://packagist.org/packages/guzzlehttp/guzzle): 7.2.0
-    - [ramsey/uuid](https://packagist.org/packages/ramsey/uuid): 4.1.1
+    - [guzzlehttp/guzzle](https://packagist.org/packages/guzzlehttp/guzzle): 7.8.1
+    - [ramsey/uuid](https://packagist.org/packages/ramsey/uuid): 4.7.5

core/php8.0Action/CHANGELOG.md core/php8.3Action/CHANGELOG.mdcore/php8.0Action/CHANGELOG.md renamed to core/php8.3Action/CHANGELOG.md

@@ -33,7 +33,7 @@ RUN curl -sL \
   && cd openwhisk-runtime-go-*/main\
   && GO111MODULE=on CGO_ENABLED=0 go build -o /bin/proxy
 
-FROM php:8.0-cli-buster
+FROM php:8.3-cli-bookworm
 
 # select the builder to use
 ARG GO_PROXY_BUILD_FROM=release
@@ -45,10 +45,11 @@ RUN apt-get -y update \
     && apt-get -y install --no-install-recommends \
       unzip \
       libfreetype6 \
-      libicu63 \
+      libicu72 \
       libjpeg62-turbo \
       libpng16-16 \
-      libssl1.1 \
+      libssl3 \
+      libssl-dev \
       libxml2 \
       libzip4 \
       libpq5 \
@@ -60,7 +61,7 @@ RUN apt-get -y update \
       libssl-dev \
       libxml2-dev \
       libzip-dev \
-      postgresql-server-dev-11 \
+      postgresql-server-dev-15 \
     \
     && docker-php-ext-install \
       bcmath \
@@ -74,19 +75,18 @@ RUN apt-get -y update \
       zip \
     \
     && mkdir -p /usr/src/php/ext/mongodb \
-    && curl -fsSL https://pecl.php.net/get/mongodb-1.9.0RC1 | tar xvz -C "/usr/src/php/ext/mongodb" --strip 1 \
+    && curl -fsSL https://pecl.php.net/get/mongodb-1.14.0 | tar xvz -C "/usr/src/php/ext/mongodb" --strip 1 \
     && docker-php-ext-install -j$(nproc) mongodb \
     \
     && apt-get purge -y --auto-remove $PHPIZE_DEPS \
-    && apt-get purge -y --auto-remove libclang-common-7-dev clang-7 llvm-7 llvm-7-dev \
     && apt-get purge -y --auto-remove libfreetype6-dev \
       libicu-dev \
       libjpeg-dev \
       libpng-dev \
       libssl-dev \
       libxml2-dev \
       libzip-dev \
-      postgresql-server-dev-11 \
+      postgresql-server-dev-15 \
     && apt-get autoremove -y \
     && apt-get clean -y \
     && rm -rf /usr/src/php

core/php8.0Action/Dockerfile core/php8.3Action/Dockerfilecore/php8.0Action/Dockerfile renamed to core/php8.3Action/Dockerfile

@@ -15,5 +15,5 @@
  * limitations under the License.
  */
 
-ext.dockerImageName = 'action-php-v8.0'
+ext.dockerImageName = 'action-php-v8.3'
 apply from: '../../gradle/docker.gradle'

core/php8.0Action/build.gradle core/php8.3Action/build.gradlecore/php8.0Action/build.gradle renamed to core/php8.3Action/build.gradle

@@ -0,0 +1,11 @@
+{
+    "config": {
+        "platform": {
+            "php": "8.3"
+        }
+    },
+    "require": {
+        "guzzlehttp/guzzle": "7.8.1",
+        "ramsey/uuid": "4.7.5"
+    }
+}

core/php8.0Action/compile.php core/php8.3Action/compile.phpcore/php8.0Action/compile.php renamed to core/php8.3Action/compile.php

@@ -75,6 +75,7 @@
             file_put_contents('php://stdout', 'The action did not return a dictionary or array.');
             $result = (string)$result;
         } else {
+            // cast result to an object for json_encode to ensure that an empty array becomes "{}
             $result = json_encode((object)$result);
         }
     } catch (Throwable $e) {
@@ -86,6 +87,6 @@
     file_put_contents('php://stderr', "\n");
     file_put_contents('php://stdout', "\n");
 
-    // cast result to an object for json_encode to ensure that an empty array becomes "{}" & send to fd/3
+    // send result to fd/3
     fwrite($fd3, $result . "\n");
 }