You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2023/06/19 12:58:59 UTC
[openwhisk-runtime-nodejs] branch master updated: Initial Nodejs 20 Commit (#239)
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 787d789 Initial Nodejs 20 Commit (#239)
787d789 is described below
commit 787d78981c6e7798c7b0baa6f5c190c56a5728cc
Author: Luke-Roy-IBM <83...@users.noreply.github.com>
AuthorDate: Mon Jun 19 14:58:53 2023 +0200
Initial Nodejs 20 Commit (#239)
---
.github/workflows/ci.yaml | 2 +
README.md | 3 +
core/nodejs20Action/.dockerignore | 13 ++++
core/nodejs20Action/CHANGELOG.md | 26 +++++++
core/nodejs20Action/Dockerfile | 44 +++++++++++
core/nodejs20Action/build.gradle | 86 ++++++++++++++++++++++
settings.gradle | 2 +
tests/dat/docker/nodejs20docker/Dockerfile | 19 +++++
.../dat/docker/nodejs20docker/build.gradle | 30 +-------
tests/dat/docker/nodejs20docker/package.json | 8 ++
.../NodeJs20ActionContainerTest.scala | 34 ++-------
.../actionContainers/NodeJs20ConcurrentTests.scala | 34 ++-------
12 files changed, 221 insertions(+), 80 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 612fcb4..810457d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -92,6 +92,8 @@ jobs:
./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
+ ./gradlew :core:nodejs20Action:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
- name: Push Release Images
if: ${{ env.PUSH_RELEASE == 'true' }}
working-directory: runtime
diff --git a/README.md b/README.md
index cae9511..e97c0a9 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ The following Node.js runtime versions (with kind & image labels) are generated
- 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`)
This README documents the build, customisation and testing of these runtime images.
@@ -49,6 +50,7 @@ All the runtime images are published by the project to Docker Hub @ [https://hub
- [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.
@@ -97,6 +99,7 @@ This will return the following runtime images with the following names: `action-
```
./gradlew tests:dat:docker:nodejs16docker:distDocker
./gradlew tests:dat:docker:nodejs18docker:distDocker
+./gradlew tests:dat:docker:nodejs20docker:distDocker
```
- Run the project tests.
diff --git a/core/nodejs20Action/.dockerignore b/core/nodejs20Action/.dockerignore
new file mode 100644
index 0000000..a1d03cb
--- /dev/null
+++ b/core/nodejs20Action/.dockerignore
@@ -0,0 +1,13 @@
+*.*~
+*.yaml
+*.tmpl
+*.gradle
+.dockerignore
+.project
+.settings
+build.xml
+Dockerfile
+logs
+node_modules
+package-lock.json
+test.js
diff --git a/core/nodejs20Action/CHANGELOG.md b/core/nodejs20Action/CHANGELOG.md
new file mode 100644
index 0000000..d9fc22e
--- /dev/null
+++ b/core/nodejs20Action/CHANGELOG.md
@@ -0,0 +1,26 @@
+<!--
+#
+# 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 20 OpenWhisk Runtime Container
+
+# Next Release
+ - Initial release with support for Node.js v1.18
+
+Node.js version = [20.3.0](https://nodejs.org/en/blog/release/v20.3.0/)
+OpenWhisk version = [OpenWhisk v3.21.7](https://www.npmjs.com/package/openwhisk)
diff --git a/core/nodejs20Action/Dockerfile b/core/nodejs20Action/Dockerfile
new file mode 100644
index 0000000..4184da8
--- /dev/null
+++ b/core/nodejs20Action/Dockerfile
@@ -0,0 +1,44 @@
+#
+# 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:20-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/nodejs20Action/build.gradle b/core/nodejs20Action/build.gradle
new file mode 100644
index 0000000..f32307b
--- /dev/null
+++ b/core/nodejs20Action/build.gradle
@@ -0,0 +1,86 @@
+/*
+ * 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-v20'
+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 a15000e..5e41933 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,8 +20,10 @@ 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'
rootProject.name = 'runtime-nodejs'
diff --git a/tests/dat/docker/nodejs20docker/Dockerfile b/tests/dat/docker/nodejs20docker/Dockerfile
new file mode 100644
index 0000000..3e2138c
--- /dev/null
+++ b/tests/dat/docker/nodejs20docker/Dockerfile
@@ -0,0 +1,19 @@
+#
+# 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-v20
+COPY package.json .
+RUN npm install --production
diff --git a/settings.gradle b/tests/dat/docker/nodejs20docker/build.gradle
similarity index 54%
copy from settings.gradle
copy to tests/dat/docker/nodejs20docker/build.gradle
index a15000e..57481fd 100644
--- a/settings.gradle
+++ b/tests/dat/docker/nodejs20docker/build.gradle
@@ -15,31 +15,5 @@
* limitations under the License.
*/
-include 'tests'
-
-include 'core:nodejsActionBase'
-include 'core:nodejs16Action'
-include 'core:nodejs18Action'
-include 'tests:dat:docker:nodejs16docker'
-include 'tests:dat:docker:nodejs18docker'
-
-rootProject.name = 'runtime-nodejs'
-
-gradle.ext.openwhisk = [
- version: '1.0.1-SNAPSHOT'
-]
-
-gradle.ext.scala = [
- version: '2.12.10',
- depVersion : '2.12',
- compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
-]
-
-
-gradle.ext.akka = [version : '2.6.12']
-gradle.ext.akka_http = [version : '10.2.4']
-
-gradle.ext.scalafmt = [
- version: '1.5.0',
- config: new File(rootProject.projectDir, '.scalafmt.conf')
-]
+ext.dockerImageName = 'nodejs20docker'
+apply from: '../../../../gradle/docker.gradle'
diff --git a/tests/dat/docker/nodejs20docker/package.json b/tests/dat/docker/nodejs20docker/package.json
new file mode 100644
index 0000000..6822c09
--- /dev/null
+++ b/tests/dat/docker/nodejs20docker/package.json
@@ -0,0 +1,8 @@
+{
+ "name": "testdocker",
+ "version": "1.0.0",
+ "main": "index.js",
+ "dependencies": {
+ "openwhisk": "2.0.0"
+ }
+}
diff --git a/settings.gradle b/tests/src/test/scala/runtime/actionContainers/NodeJs20ActionContainerTest.scala
similarity index 54%
copy from settings.gradle
copy to tests/src/test/scala/runtime/actionContainers/NodeJs20ActionContainerTest.scala
index a15000e..9348ed7 100644
--- a/settings.gradle
+++ b/tests/src/test/scala/runtime/actionContainers/NodeJs20ActionContainerTest.scala
@@ -15,31 +15,13 @@
* limitations under the License.
*/
-include 'tests'
+package runtime.actionContainers
-include 'core:nodejsActionBase'
-include 'core:nodejs16Action'
-include 'core:nodejs18Action'
-include 'tests:dat:docker:nodejs16docker'
-include 'tests:dat:docker:nodejs18docker'
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
-rootProject.name = 'runtime-nodejs'
-
-gradle.ext.openwhisk = [
- version: '1.0.1-SNAPSHOT'
-]
-
-gradle.ext.scala = [
- version: '2.12.10',
- depVersion : '2.12',
- compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
-]
-
-
-gradle.ext.akka = [version : '2.6.12']
-gradle.ext.akka_http = [version : '10.2.4']
-
-gradle.ext.scalafmt = [
- version: '1.5.0',
- config: new File(rootProject.projectDir, '.scalafmt.conf')
-]
+@RunWith(classOf[JUnitRunner])
+class NodeJs20ActionContainerTests extends NodeJsActionContainerTests {
+ override lazy val nodejsContainerImageName = "action-nodejs-v20"
+ override lazy val nodejsTestDockerImageName = "nodejs20docker"
+}
diff --git a/settings.gradle b/tests/src/test/scala/runtime/actionContainers/NodeJs20ConcurrentTests.scala
similarity index 54%
copy from settings.gradle
copy to tests/src/test/scala/runtime/actionContainers/NodeJs20ConcurrentTests.scala
index a15000e..2e7cc62 100644
--- a/settings.gradle
+++ b/tests/src/test/scala/runtime/actionContainers/NodeJs20ConcurrentTests.scala
@@ -15,31 +15,13 @@
* limitations under the License.
*/
-include 'tests'
+package runtime.actionContainers
-include 'core:nodejsActionBase'
-include 'core:nodejs16Action'
-include 'core:nodejs18Action'
-include 'tests:dat:docker:nodejs16docker'
-include 'tests:dat:docker:nodejs18docker'
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
-rootProject.name = 'runtime-nodejs'
-
-gradle.ext.openwhisk = [
- version: '1.0.1-SNAPSHOT'
-]
-
-gradle.ext.scala = [
- version: '2.12.10',
- depVersion : '2.12',
- compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
-]
-
-
-gradle.ext.akka = [version : '2.6.12']
-gradle.ext.akka_http = [version : '10.2.4']
-
-gradle.ext.scalafmt = [
- version: '1.5.0',
- config: new File(rootProject.projectDir, '.scalafmt.conf')
-]
+@RunWith(classOf[JUnitRunner])
+class NodeJs20ConcurrentTests extends NodeJsConcurrentTests {
+ override lazy val nodejsContainerImageName = "action-nodejs-v20"
+ override lazy val nodejsTestDockerImageName = "nodejs20docker"
+}