This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-nodejs.git
The following commit(s) were added to refs/heads/master by this push:
new 589f9d4 remove support for Node.js v16 (EOL 9/11/23). (#241)
589f9d4 is described below
commit 589f9d487e792b81c8f54282eeac2989506ddccc
Author: David Grove <[email protected]>
AuthorDate: Mon Sep 11 09:15:25 2023 -0400
remove support for Node.js v16 (EOL 9/11/23). (#241)
---
.github/workflows/ci.yaml | 2 -
README.md | 13 ++--
core/nodejs16Action/.dockerignore | 13 ----
core/nodejs16Action/CHANGELOG.md | 35 ---------
core/nodejs16Action/Dockerfile | 44 -----------
core/nodejs16Action/build.gradle | 86 ----------------------
settings.gradle | 2 -
tests/dat/docker/nodejs16docker/Dockerfile | 19 -----
tests/dat/docker/nodejs16docker/build.gradle | 19 -----
tests/dat/docker/nodejs16docker/package.json | 8 --
.../NodeJs16ActionContainerTests.scala | 27 -------
.../actionContainers/NodeJs16ConcurrentTests.scala | 27 -------
12 files changed, 5 insertions(+), 290 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 810457d..ab7de2c 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:nodejs16Action:distDocker -PdockerRegistry=docker.io
-PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
- ./gradlew :core:nodejs16Action:distDocker -PdockerRegistry=docker.io
-PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
./gradlew :core:nodejs18Action:distDocker -PdockerRegistry=docker.io
-PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
./gradlew :core:nodejs18Action:distDocker -PdockerRegistry=docker.io
-PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
./gradlew :core:nodejs20Action:distDocker -PdockerRegistry=docker.io
-PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
diff --git a/README.md b/README.md
index e97c0a9..515e233 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,6 @@ This repository contains sources files needed to build the
Node.js runtimes for
The following Node.js runtime versions (with kind & image labels) are
generated by the build system:
-- Node.js 16 (`nodejs:16` & `openwhisk/action-nodejs-v16`)
- Node.js 18 (`nodejs:18` & `openwhisk/action-nodejs-v18`)
- Node.js 20 (`nodejs:20` & `openwhisk/action-nodejs-v20`)
@@ -38,24 +37,23 @@ This README documents the build, customisation and testing
of these runtime imag
If the deployment of Apache OpenWhisk includes these images in the runtime
manifest, use the `--kind` parameter to select the Node.js runtime version.
-### Node.js v16
+### Node.js v20
```
-wsk action update myAction myAction.js --kind nodejs:16
+wsk action update myAction myAction.js --kind nodejs:20
```
## Images
All the runtime images are published by the project to Docker Hub @
[https://hub.docker.com/u/openwhisk](https://hub.docker.com/u/openwhisk)
--
[https://hub.docker.com/r/openwhisk/action-nodejs-v16](https://hub.docker.com/r/openwhisk/action-nodejs-v16)
-
[https://hub.docker.com/r/openwhisk/action-nodejs-v18](https://hub.docker.com/r/openwhisk/action-nodejs-v18)
-
[https://hub.docker.com/r/openwhisk/action-nodejs-v20](https://hub.docker.com/r/openwhisk/action-nodejs-v20)
These images can be used to execute Node.js actions on any deployment of
Apache OpenWhisk, even those without those images defined the in runtime
manifest, using the `--docker` action parameter.
```
-wsk action update myAction myAction.js --docker openwhisk/action-nodejs-v16
+wsk action update myAction myAction.js --docker openwhisk/action-nodejs-v20
```
If you build a custom version of the images, pushing those an external Docker
Hub repository will allow you to use those on the Apache OpenWhisk deployment.
@@ -77,11 +75,11 @@ The `core/nodejsActionBase` folder contains the Node.js app
server used to imple
- Run the `distDocker` command to generate local Docker images for the
different runtime versions.
```
-./gradlew core:nodejs16Action:distDocker
./gradlew core:nodejs18Action:distDocker
+./gradlew core:nodejs20Action:distDocker
```
-This will return the following runtime images with the following names:
`action-nodejs-v16`, and `action-nodejs-v18`.
+This will return the following runtime images with the following names:
`action-nodejs-v18`, and `action-nodejs-v20`.
### Testing
@@ -97,7 +95,6 @@ This will return the following runtime images with the
following names: `action-
- Build the custom Docker images used in local testing.
```
-./gradlew tests:dat:docker:nodejs16docker:distDocker
./gradlew tests:dat:docker:nodejs18docker:distDocker
./gradlew tests:dat:docker:nodejs20docker:distDocker
```
diff --git a/core/nodejs16Action/.dockerignore
b/core/nodejs16Action/.dockerignore
deleted file mode 100644
index a1d03cb..0000000
--- a/core/nodejs16Action/.dockerignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.*~
-*.yaml
-*.tmpl
-*.gradle
-.dockerignore
-.project
-.settings
-build.xml
-Dockerfile
-logs
-node_modules
-package-lock.json
-test.js
diff --git a/core/nodejs16Action/CHANGELOG.md b/core/nodejs16Action/CHANGELOG.md
deleted file mode 100644
index bc770d5..0000000
--- a/core/nodejs16Action/CHANGELOG.md
+++ /dev/null
@@ -1,35 +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.
-#
--->
-
-# NodeJS 16 OpenWhisk Runtime Container
-
-# Apache 1.21
- - Add tar.gz support to the nodejs runtime Proxy (#235)
- - Add functionality to install modules during init (#233)
- - Use openwhisk-client-js 3.21.7 (#223)
- - use node:16-bullseye as base image to automatically get vulnerability fixes
-
-Node.js version = [16.20.0](https://nodejs.org/en/blog/release/v16.20.0/)
-OpenWhisk version = [OpenWhisk
v3.21.7](https://www.npmjs.com/package/openwhisk)
-
-# Apache 1.20
- - Initial release with support for Node.js v1.16
-
-Node.js version = [16.15.0](https://nodejs.org/en/blog/release/v16.15.0/)
-OpenWhisk version = [OpenWhisk
v3.21.6](https://www.npmjs.com/package/openwhisk)
diff --git a/core/nodejs16Action/Dockerfile b/core/nodejs16Action/Dockerfile
deleted file mode 100644
index 3197263..0000000
--- a/core/nodejs16Action/Dockerfile
+++ /dev/null
@@ -1,44 +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.
-#
-
-FROM node:16-bullseye
-
-# Initial update and some basics.
-#
-RUN apt-get update && apt-get install -y \
- imagemagick \
- graphicsmagick \
- zip \
- unzip \
- && rm -rf /var/lib/apt/lists/*
-
-# Add sources and copy the package.json to root container,
-# so npm packages from user functions take precedence.
-#
-WORKDIR /nodejsAction
-ADD . /nodejsAction/
-COPY package.json /
-
-# Customize runtime with additional packages.
-# Install package globally so user packages can override.
-#
-RUN cd / && npm install --no-package-lock --production \
- && npm cache clean --force
-
-EXPOSE 8080
-
-CMD node --expose-gc app.js
diff --git a/core/nodejs16Action/build.gradle b/core/nodejs16Action/build.gradle
deleted file mode 100644
index ac4c50e..0000000
--- a/core/nodejs16Action/build.gradle
+++ /dev/null
@@ -1,86 +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.
- */
-
-apply plugin: 'eclipse'
-eclipse {
- project {
- natures 'org.eclipse.wst.jsdt.core.jsNature'
- buildCommand 'org.eclipse.wst.jsdt.core.javascriptValidator'
- }
-}
-
-ext.dockerImageName = 'action-nodejs-v16'
-apply from: '../../gradle/docker.gradle'
-
-distDocker.dependsOn 'copyPackageJson'
-distDocker.dependsOn 'copyProxy'
-distDocker.dependsOn 'copyRunner'
-distDocker.dependsOn 'copyService'
-distDocker.dependsOn 'copyPlatform'
-distDocker.dependsOn 'copyOpenWhisk'
-distDocker.dependsOn 'copyKnative'
-distDocker.dependsOn 'copyBuildTemplate'
-distDocker.finalizedBy('cleanup')
-
-task copyPackageJson(type: Copy) {
- from '../nodejsActionBase/package.json'
- into '.'
-}
-
-task copyProxy(type: Copy) {
- from '../nodejsActionBase/app.js'
- into '.'
-}
-
-task copyRunner(type: Copy) {
- from '../nodejsActionBase/runner.js'
- into '.'
-}
-
-task copyService(type: Copy) {
- from '../nodejsActionBase/src/service.js'
- into './src'
-}
-
-task copyPlatform(type: Copy) {
- from '../nodejsActionBase/platform/platform.js'
- into './platform'
-}
-
-task copyOpenWhisk(type: Copy) {
- from '../nodejsActionBase/platform/openwhisk.js'
- into './platform'
-}
-
-task copyKnative(type: Copy) {
- from '../nodejsActionBase/platform/knative.js'
- into './platform'
-}
-
-task copyBuildTemplate(type: Copy) {
- from '../nodejsActionBase/buildtemplate.yaml'
- into '.'
-}
-
-task cleanup(type: Delete) {
- delete 'package.json'
- delete 'app.js'
- delete 'runner.js'
- delete 'src'
- delete 'platform'
- delete 'buildtemplate.yaml'
-}
diff --git a/settings.gradle b/settings.gradle
index 5e41933..ed6925d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,10 +18,8 @@
include 'tests'
include 'core:nodejsActionBase'
-include 'core:nodejs16Action'
include 'core:nodejs18Action'
include 'core:nodejs20Action'
-include 'tests:dat:docker:nodejs16docker'
include 'tests:dat:docker:nodejs18docker'
include 'tests:dat:docker:nodejs20docker'
diff --git a/tests/dat/docker/nodejs16docker/Dockerfile
b/tests/dat/docker/nodejs16docker/Dockerfile
deleted file mode 100644
index b6f3a53..0000000
--- a/tests/dat/docker/nodejs16docker/Dockerfile
+++ /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.
-#
-FROM action-nodejs-v16
-COPY package.json .
-RUN npm install --production
diff --git a/tests/dat/docker/nodejs16docker/build.gradle
b/tests/dat/docker/nodejs16docker/build.gradle
deleted file mode 100644
index ad74d5c..0000000
--- a/tests/dat/docker/nodejs16docker/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 = 'nodejs16docker'
-apply from: '../../../../gradle/docker.gradle'
diff --git a/tests/dat/docker/nodejs16docker/package.json
b/tests/dat/docker/nodejs16docker/package.json
deleted file mode 100644
index 6822c09..0000000
--- a/tests/dat/docker/nodejs16docker/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "name": "testdocker",
- "version": "1.0.0",
- "main": "index.js",
- "dependencies": {
- "openwhisk": "2.0.0"
- }
-}
diff --git
a/tests/src/test/scala/runtime/actionContainers/NodeJs16ActionContainerTests.scala
b/tests/src/test/scala/runtime/actionContainers/NodeJs16ActionContainerTests.scala
deleted file mode 100644
index 456be7b..0000000
---
a/tests/src/test/scala/runtime/actionContainers/NodeJs16ActionContainerTests.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 NodeJs16ActionContainerTests extends NodeJsActionContainerTests {
- override lazy val nodejsContainerImageName = "action-nodejs-v16"
- override lazy val nodejsTestDockerImageName = "nodejs16docker"
-}
diff --git
a/tests/src/test/scala/runtime/actionContainers/NodeJs16ConcurrentTests.scala
b/tests/src/test/scala/runtime/actionContainers/NodeJs16ConcurrentTests.scala
deleted file mode 100644
index d2c28fb..0000000
---
a/tests/src/test/scala/runtime/actionContainers/NodeJs16ConcurrentTests.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 NodeJs16ConcurrentTests extends NodeJsConcurrentTests {
- override lazy val nodejsContainerImageName = "action-nodejs-v16"
- override lazy val nodejsTestDockerImageName = "nodejs16docker"
-}
