This is an automated email from the ASF dual-hosted git repository.
lukeroy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-php.git
The following commit(s) were added to refs/heads/master by this push:
new aebeab4 Remove PHP 7.4 (#133)
aebeab4 is described below
commit aebeab43da9b5b3f355e095bd4a20e9ce61192a5
Author: Luke-Roy-IBM <[email protected]>
AuthorDate: Wed Jul 19 14:53:41 2023 +0200
Remove PHP 7.4 (#133)
PHP 7.4 is End of life and no longer supported and is therfor beeing removed
https://www.php.net/supported-versions.php
---
.github/workflows/ci.yaml | 2 -
README.md | 20 +----
core/php7.4Action/CHANGELOG.md | 58 -------------
core/php7.4Action/Dockerfile | 99 ----------------------
core/php7.4Action/build.gradle | 19 -----
core/php7.4Action/compile.php | 82 ------------------
core/php7.4Action/composer.json | 11 ---
core/php7.4Action/php.ini | 37 --------
core/php7.4Action/runner.php | 91 --------------------
settings.gradle | 1 -
.../Php74ActionContainerTests.scala | 27 ------
11 files changed, 3 insertions(+), 444 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 16569cc..4f61fc7 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -88,8 +88,6 @@ jobs:
working-directory: runtime
run: |
SHORT_COMMIT=$(git rev-parse --short "$GITHUB_SHA")
- ./gradlew :core:php7.4Action:distDocker -PdockerRegistry=docker.io
-PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
- ./gradlew :core:php7.4Action:distDocker -PdockerRegistry=docker.io
-PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
./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
diff --git a/README.md b/README.md
index 6a10778..f076b8f 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@
## PHP versions
-This runtime provides PHP 8.1, 8.0 and 7.4.
+This runtime provides PHP 8.1, 8.0
### Give it a try today
To use as a docker action
@@ -38,11 +38,6 @@ PHP 8.0:
wsk action update myAction myAction.php --docker
openwhisk/action-php-v8.0:latest
```
-PHP 7.4:
-```
-wsk action update myAction myAction.php --docker
openwhisk/action-php-v7.4:latest
-```
-
This works on any deployment of Apache OpenWhisk
### To use on deployment that contains the runtime as a kind
@@ -58,19 +53,14 @@ PHP 8.0:
wsk action update myAction myAction.php --kind php:8.0
```
-PHP 7.4:
-```
-wsk action update myAction myAction.php --kind php:7.4
-```
### Local development
```
./gradlew core:php8.1Action:distDocker
./gradlew core:php8.0Action:distDocker
-./gradlew core:php7.4Action:distDocker
```
-This will produce the images `whisk/action-php-v8.1`, `whisk/action-php-v8.0`
and `whisk/action-php-v7.4` respectively.
+This will produce the images `whisk/action-php-v8.1` and
`whisk/action-php-v8.0` respectively.
Build and Push image
```
@@ -79,7 +69,7 @@ docker login
./gradlew core:php7.4Action:distDocker -PdockerImagePrefix=$prefix-user
-PdockerRegistry=docker.io
```
-Deploy OpenWhisk using ansible environment that contains the kinds `php:8.1`,
`php:8.0` and `php:7.4`
+Deploy OpenWhisk using ansible environment that contains the kinds `php:8.1`
and `php:8.0`
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.
@@ -110,10 +100,6 @@ 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
```
-```
-docker tag whisk/php7.4Action $user_prefix/action-php-v7.4
-docker push $user_prefix/action-php-v7.4
-```
Then create the action using your image from dockerhub
```
diff --git a/core/php7.4Action/CHANGELOG.md b/core/php7.4Action/CHANGELOG.md
deleted file mode 100644
index b09934f..0000000
--- a/core/php7.4Action/CHANGELOG.md
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
--->
-
-## Apache 1.18.0
- - Use php:7.4-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 7.4.21
- - Build actionloop from [email protected] (#107)
- - Resolve akka versions explicitly. (#105, #104)
-
-## Apache 1.16.0
- - Update version of PHP to 7.4.15
- - Use openwhisk-runtime-go 1.17.0 to build proxy
- - Update guzzlehttp/guzzle to 6.5.5
- - Update ramsey/uuid to 3.9.3
-
-## Apache 1.15.0
- - Update version of PHP to 7.4.10
- - Use golang 1.15 and openwhisk-runtime-go 1.16.0 to build proxy
-
-## Apache 1.14.0
-Initial release
-- Added: PHP: 7.4.0
-- Added: PHP extensions in addition to the standard ones:
- - bcmath
- - curl
- - gd
- - intl
- - mbstring
- - mysqli
- - pdo_mysql
- - pdo_pgsql
- - pdo_sqlite
- - soap
- - zip
- - mongo
-- Added: Composer packages:
- - [guzzlehttp/guzzle](https://packagist.org/packages/guzzlehttp/guzzle):
6.5.0
- - [ramsey/uuid](https://packagist.org/packages/ramsey/uuid): 3.9.1
diff --git a/core/php7.4Action/Dockerfile b/core/php7.4Action/Dockerfile
deleted file mode 100644
index 3786b11..0000000
--- a/core/php7.4Action/Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# build go proxy from source
-FROM golang:1.20 AS builder_source
-ARG GO_PROXY_GITHUB_USER=apache
-ARG GO_PROXY_GITHUB_BRANCH=master
-RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
- https://github.com/${GO_PROXY_GITHUB_USER}/openwhisk-runtime-go /src ;\
- cd /src ; env GO111MODULE=on CGO_ENABLED=0 go build main/proxy.go && \
- mv proxy /bin/proxy
-
-# or build it from a release
-FROM golang:1.20 AS builder_release
-ARG [email protected]
-RUN curl -sL \
-
https://github.com/apache/openwhisk-runtime-go/archive/{$GO_PROXY_RELEASE_VERSION}.tar.gz\
- | tar xzf -\
- && cd openwhisk-runtime-go-*/main\
- && GO111MODULE=on GO111MODULE=on go build -o /bin/proxy
-
-FROM php:7.4-cli-buster
-
-# select the builder to use
-ARG GO_PROXY_BUILD_FROM=release
-
-# install dependencies
-RUN \
- apt-get -y update \
- # Upgrade installed packages to get latest security fixes if the base
image does not contain them already.
- && apt-get upgrade -y --no-install-recommends \
- && apt-get -y install \
- libfreetype6-dev \
- libicu-dev \
- libicu63 \
- libjpeg-dev \
- libpng-dev \
- libssl-dev \
- libxml2-dev \
- libzip-dev \
- postgresql-server-dev-11 \
- zip \
- unzip \
- zlib1g-dev \
- # Cleanup apt data, we do not need them later on.
- && rm -rf /var/lib/apt/lists/*
-
-# Install useful PHP extensions
-RUN \
- docker-php-ext-install \
- bcmath \
- gd \
- intl \
- mysqli \
- opcache \
- pdo_mysql \
- pdo_pgsql \
- soap \
- zip \
- && pecl install mongodb \
- && docker-php-ext-enable mongodb
-
-COPY php.ini /usr/local/etc/php
-
-# install composer
-RUN curl -s -f -L -o /tmp/installer.php https://getcomposer.org/installer \
- && php /tmp/installer.php --no-ansi --install-dir=/usr/bin
--filename=composer \
- && composer --ansi --version --no-interaction --no-plugins --no-scripts
-
-# install default Composer dependencies
-RUN mkdir -p /phpAction/composer
-COPY composer.json /phpAction/composer
-RUN cd /phpAction/composer && /usr/bin/composer install --no-plugins
--no-scripts --prefer-dist --no-dev -o && rm composer.lock
-
-# install proxy binary along with compile and launcher scripts
-RUN mkdir -p /phpAction/action
-WORKDIR /phpAction
-COPY --from=builder_source /bin/proxy /bin/proxy_source
-COPY --from=builder_release /bin/proxy /bin/proxy_release
-RUN mv /bin/proxy_${GO_PROXY_BUILD_FROM} /bin/proxy
-ADD compile.php /bin/compile.php
-ADD runner.php /bin/runner.php
-ENV OW_COMPILER=/bin/compile.php
-
-ENTRYPOINT [ "/bin/proxy" ]
diff --git a/core/php7.4Action/build.gradle b/core/php7.4Action/build.gradle
deleted file mode 100644
index 166a55a..0000000
--- a/core/php7.4Action/build.gradle
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-ext.dockerImageName = 'action-php-v7.4'
-apply from: '../../gradle/docker.gradle'
diff --git a/core/php7.4Action/compile.php b/core/php7.4Action/compile.php
deleted file mode 100755
index d74939b..0000000
--- a/core/php7.4Action/compile.php
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * compile
- *
- * This file is launched by the action proxy.
- * It copies runner.php to right source directory and creates a bash exec
script
- * that the action proxy will call to start everything off
- */
-
-main($argc, $argv);
-exit;
-
-function main($argc, $argv)
-{
- if ($argc < 4) {
- print("usage: <main-function-name> <source-dir> <bin-dir>");
- exit(1);
- }
- $main = $argv[1];
- $src = realpath($argv[2]);
- $bin = realpath($argv[3]);
-
- $shim = $bin.'/exec';
-
- sources($src);
- build($shim, $src, $main);
-}
-
-/**
- * Sort out the source code
- *
- * 1. Copy src/exec to src/index.php if necessary
- * 2. Ensure vendor directory exists
- */
-function sources(string $src)
-{
- // If the file uploaded by the user is a plain PHP file, then
- // the filename will be called exec by the action proxy.
- // Rename it to index.php
- if (file_exists($src . '/exec')) {
- rename($src . '/exec', $src . '/index.php');
- }
-
- // put vendor in the right place if it doesn't exist
- if (!is_dir($src . '/vendor')) {
- exec('cp -a /phpAction/composer/vendor ' . escapeshellarg($src .
'/vendor'));
- }
-}
-
-/**
- * Create bin/exec shim
- */
-function build(string $shim, string $src, string $main) : void
-{
- $contents = <<<EOT
-#!/bin/bash
-cd $src
-exec php -f /bin/runner.php -- "$main"
-
-EOT;
-
- file_put_contents($shim, $contents);
- chmod($shim, 0755);
-}
diff --git a/core/php7.4Action/composer.json b/core/php7.4Action/composer.json
deleted file mode 100644
index 83202f0..0000000
--- a/core/php7.4Action/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "config": {
- "platform": {
- "php": "7.4"
- }
- },
- "require": {
- "guzzlehttp/guzzle": "6.5.5",
- "ramsey/uuid": "3.9.3"
- }
-}
diff --git a/core/php7.4Action/php.ini b/core/php7.4Action/php.ini
deleted file mode 100644
index bee173d..0000000
--- a/core/php7.4Action/php.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-; Licensed to the Apache Software Foundation (ASF) under one or more
-; contributor license agreements. See the NOTICE file distributed with
-; this work for additional information regarding copyright ownership.
-; The ASF licenses this file to You under the Apache License, Version 2.0
-; (the "License"); you may not use this file except in compliance with
-; the License. You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-[PHP]
-short_open_tag = Off
-output_buffering = Off
-expose_php = Off
-max_execution_time = 0
-memory_limit = -1
-error_reporting = E_ALL
-display_errors = Off
-log_errors = On
-log_errors_max_len = 0
-html_errors = Off
-variables_order = "EGPCS"
-request_order = "GP"
-post_max_size = 0
-enable_dl = Off
-zend.assertions = -1
-
-[opcache]
-opcache.enable=1
-opcache.enable_cli=1
-opcache.max_accelerated_files=7963
-opcache.validate_timestamps=0
diff --git a/core/php7.4Action/runner.php b/core/php7.4Action/runner.php
deleted file mode 100755
index 1fc569e..0000000
--- a/core/php7.4Action/runner.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// open fd/3 as that's where we send the result
-$fd3 = fopen('php://fd/3', 'wb');
-
-// Register a shutdown function so that we can fail gracefully when a fatal
error occurs
-register_shutdown_function(static function () use ($fd3) {
- $error = error_get_last();
- if ($error && in_array($error['type'], [E_ERROR, E_CORE_ERROR,
E_COMPILE_ERROR, E_USER_ERROR], true)) {
- file_put_contents('php://stderr', "An error occurred running the
action.\n");
- fwrite($fd3, "An error occurred running the action.\n");
- }
- fclose($fd3);
-});
-
-require 'vendor/autoload.php';
-require 'index.php';
-
-// retrieve main function
-$__functionName = $argv[1] ?? 'main';
-
-
-// read stdin
-while ($f = fgets(STDIN)) {
- // call the function
- $data = json_decode($f ?? '', true);
- if (!is_array($data)) {
- $data = [];
- }
-
- // convert all parameters other than value to environment variables
- foreach ($data as $key => $value) {
- if ($key !== 'value') {
- $envKeyName = '__OW_' . strtoupper($key);
- $_ENV[$envKeyName] = $value;
- putenv($envKeyName . '=' . $value);
- }
- }
-
- $values = $data['value'] ?? [];
- try {
- $result = $__functionName($values);
-
- // convert result to an array if we can
- if (is_object($result)) {
- if (method_exists($result, 'getArrayCopy')) {
- $result = $result->getArrayCopy();
- } elseif ($result instanceof stdClass) {
- $result = (array)$result;
- }
- } elseif ($result === null) {
- $result = [];
- }
-
- // process the result
- if (!is_array($result)) {
- file_put_contents('php://stderr', 'Result must be an array but has
type "'
- . gettype($result) . '": ' . $result);
- file_put_contents('php://stdout', 'The action did not return a
dictionary or array.');
- $result = (string)$result;
- } else {
- $result = json_encode((object)$result);
- }
- } catch (Throwable $e) {
- file_put_contents('php://stderr', (string)$e);
- $result = 'An error occurred running the action.';
- }
-
- // ensure that the sentinels will be on their own lines
- 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
- fwrite($fd3, $result . "\n");
-}
diff --git a/settings.gradle b/settings.gradle
index 7340010..ea85c7a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,7 +17,6 @@
include 'tests'
-include 'core:php7.4Action'
include 'core:php8.0Action'
include 'core:php8.1Action'
diff --git
a/tests/src/test/scala/runtime/actionContainers/Php74ActionContainerTests.scala
b/tests/src/test/scala/runtime/actionContainers/Php74ActionContainerTests.scala
deleted file mode 100644
index ce3f122..0000000
---
a/tests/src/test/scala/runtime/actionContainers/Php74ActionContainerTests.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package runtime.actionContainers
-
-import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
-
-@RunWith(classOf[JUnitRunner])
-class Php74ActionContainerTests extends Php7ActionContainerTests {
-
- override lazy val phpContainerImageName = "action-php-v7.4"
-}
