You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ra...@apache.org on 2021/08/04 13:47:38 UTC
[openwhisk-runtime-nodejs] branch master updated: remove Node.js 10
support
This is an automated email from the ASF dual-hosted git repository.
rabbah 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 ea0f288 remove Node.js 10 support
ea0f288 is described below
commit ea0f288d87b918cebfc194b28a3454dedc5d8205
Author: David Grove <gr...@us.ibm.com>
AuthorDate: Thu Jul 8 10:24:46 2021 -0400
remove Node.js 10 support
---
.travis.yml | 2 +-
README.md | 12 +--
core/nodejs10Action/.dockerignore | 13 ----
core/nodejs10Action/CHANGELOG.md | 61 ---------------
core/nodejs10Action/Dockerfile | 45 -----------
core/nodejs10Action/build.gradle | 86 ----------------------
core/nodejs10Action/knative/Dockerfile | 38 ----------
settings.gradle | 2 -
tests/dat/docker/nodejs10docker/Dockerfile | 19 -----
tests/dat/docker/nodejs10docker/build.gradle | 19 -----
tests/dat/docker/nodejs10docker/package.json | 8 --
.../NodeJs10ActionContainerTests.scala | 27 -------
.../actionContainers/NodeJs10ConcurrentTests.scala | 27 -------
13 files changed, 2 insertions(+), 357 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 494870d..4f0d84f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ deploy:
all_branches: true
repo: apache/openwhisk-runtime-nodejs
- provider: script
- script: "./tools/travis/publish.sh openwhisk nodejs10Action nightly && ./tools/travis/publish.sh openwhisk nodejs12Action nightly && ./tools/travis/publish.sh openwhisk nodejs14Action nightly && ./tools/travis/publish.sh openwhisk typescript37Action nightly"
+ script: "./tools/travis/publish.sh openwhisk nodejs12Action nightly && ./tools/travis/publish.sh openwhisk nodejs14Action nightly && ./tools/travis/publish.sh openwhisk typescript37Action nightly"
on:
branch: master
repo: apache/openwhisk-runtime-nodejs
diff --git a/README.md b/README.md
index bd4b668..569c17f 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 10.24.1 (`nodejs:10` & `openwhisk/action-nodejs-v10`)
- Node.js 12.22.1 (`nodejs:12` & `openwhisk/action-nodejs-v12`)
- Node.js 14.16.1 (`nodejs:14` & `openwhisk/action-nodejs-v14`)
@@ -38,12 +37,6 @@ 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 v10
-
-```
-wsk action update myAction myAction.js --kind nodejs:10
-```
-
### Node.js v12
```
@@ -60,7 +53,6 @@ wsk action update myAction myAction.js --kind nodejs:14
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-v10](https://hub.docker.com/r/openwhisk/action-nodejs-v10)
- [https://hub.docker.com/r/openwhisk/action-nodejs-v12](https://hub.docker.com/r/openwhisk/action-nodejs-v12)
- [https://hub.docker.com/r/openwhisk/action-nodejs-v14](https://hub.docker.com/r/openwhisk/action-nodejs-v14)
@@ -89,12 +81,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:nodejs10Action:distDocker
./gradlew core:nodejs12Action:distDocker
./gradlew core:nodejs14Action:distDocker
```
-This will return the following runtime images with the following names: `action-nodejs-v10`, `action-nodejs-v12` and `action-nodejs-v14`.
+This will return the following runtime images with the following names: `action-nodejs-v12` and `action-nodejs-v14`.
### Testing
@@ -110,7 +101,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:nodejs10docker:distDocker
./gradlew tests:dat:docker:nodejs12docker:distDocker
./gradlew tests:dat:docker:nodejs14docker:distDocker
```
diff --git a/core/nodejs10Action/.dockerignore b/core/nodejs10Action/.dockerignore
deleted file mode 100644
index a1d03cb..0000000
--- a/core/nodejs10Action/.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/nodejs10Action/CHANGELOG.md b/core/nodejs10Action/CHANGELOG.md
deleted file mode 100644
index 324e4cb..0000000
--- a/core/nodejs10Action/CHANGELOG.md
+++ /dev/null
@@ -1,61 +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 10 OpenWhisk Runtime Container
-
-# Apache 1.18
- - Update to openwhisk-client-js 3.21.4 (#194)
- - Constraint all transitive akka-* dependencies (#195)
- - Update NodeJs to gather fixes (#192)
- - Update NodeJs to gather fixes (#188)
- - Update from source build. (#187)
- - Update NodeJs to gather fixes (#186)
-
-Node.js version = [10.24.1](https://nodejs.org/en/blog/release/v10.24.1/)
-OpenWhisk version = [OpenWhisk v3.21.4](https://www.npmjs.com/package/openwhisk)
-
-## Apache 1.17
- - Update Node.js and OpenWhisk versions.
-
-Node.js version = [10.23.0](https://nodejs.org/en/blog/release/v10.23.0/)
-OpenWhisk version = [OpenWhisk v3.21.3](https://www.npmjs.com/package/openwhisk)
-
-## Apache 1.16
-Changes:
- - Update Node.js and OpenWhisk versions.
-
-Node.js version = [10.21.0](https://nodejs.org/en/blog/release/v10.21.0/)
-OpenWhisk version = [OpenWhisk v3.21.2](https://www.npmjs.com/package/openwhisk)
-
-## Apache 1.15
-Changes:
- - Update Node.js
- - Update OpenWhisk npm package
- - Support for __OW_ACTION_VERSION (openwhisk/4761)
-
-Node.js version = [10.19.0](https://nodejs.org/en/blog/release/v10.19.0/)
-OpenWhisk version = [OpenWhisk v3.21.1](https://www.npmjs.com/package/openwhisk)
-
-## Apache 1.13
-Changes:
-- Initial version with NodejS10 LTS
-- Node.js version = [10.16.3](https://nodejs.org/en/blog/release/v10.16.3/)
-- [OpenWhisk v3.18.0](https://www.npmjs.com/package/openwhisk) - JavaScript client library for the OpenWhisk platform. Provides a wrapper around the OpenWhisk APIs.
-
-Node.js version = [10.15.3](https://nodejs.org/en/blog/release/v10.15.3/)
diff --git a/core/nodejs10Action/Dockerfile b/core/nodejs10Action/Dockerfile
deleted file mode 100644
index 1ac2b0d..0000000
--- a/core/nodejs10Action/Dockerfile
+++ /dev/null
@@ -1,45 +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:10.24.1-stretch
-
-# Initial update and some basics.
-#
-RUN apt-get update && apt-get install -y \
- imagemagick \
- graphicsmagick \
- 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
-
-# The flag --experimental-worker enables worker threads,
-# see https://nodejs.org/docs/latest-v10.x/api/worker_threads.html
-CMD node --experimental-worker --expose-gc app.js
diff --git a/core/nodejs10Action/build.gradle b/core/nodejs10Action/build.gradle
deleted file mode 100644
index b52bdaf..0000000
--- a/core/nodejs10Action/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-v10'
-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/core/nodejs10Action/knative/Dockerfile b/core/nodejs10Action/knative/Dockerfile
deleted file mode 100644
index 2453c2b..0000000
--- a/core/nodejs10Action/knative/Dockerfile
+++ /dev/null
@@ -1,38 +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:10.20.1-stretch
-RUN apt-get update && apt-get install -y \
- imagemagick \
- graphicsmagick \
- unzip \
- && rm -rf /var/lib/apt/lists/*
-WORKDIR /nodejsAction
-# COPY source code "*.js" from nodejsActionBase to current working dir
-RUN mkdir /src /platform
-COPY ./core/nodejsActionBase/*.js ./
-COPY ./core/nodejsActionBase/src/*.js ./src/
-COPY ./core/nodejsActionBase/platform/*.js ./platform/
-COPY . .
-# COPY the package.json to root container, so we can install npm packages a level up from user's packages,
-# so user's packages take precedence
-COPY ./core/nodejsActionBase/package.json /
-RUN cd / && npm install --no-package-lock \
- && npm cache clean --force
-EXPOSE 8080
-# The flag --experimental-worker enables worker threads, see https://nodejs.org/docs/latest-v10.x/api/worker_threads.html
-CMD node --experimental-worker --expose-gc app.js
diff --git a/settings.gradle b/settings.gradle
index af8d33d..4f51240 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,11 +18,9 @@
include 'tests'
include 'core:nodejsActionBase'
-include 'core:nodejs10Action'
include 'core:nodejs12Action'
include 'core:nodejs14Action'
include 'core:typescript37Action'
-include 'tests:dat:docker:nodejs10docker'
include 'tests:dat:docker:nodejs12docker'
include 'tests:dat:docker:nodejs14docker'
include 'tests:dat:docker:typescript37docker'
diff --git a/tests/dat/docker/nodejs10docker/Dockerfile b/tests/dat/docker/nodejs10docker/Dockerfile
deleted file mode 100644
index 2efdd32..0000000
--- a/tests/dat/docker/nodejs10docker/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-v10
-COPY package.json .
-RUN npm install --production
diff --git a/tests/dat/docker/nodejs10docker/build.gradle b/tests/dat/docker/nodejs10docker/build.gradle
deleted file mode 100644
index 5f6f094..0000000
--- a/tests/dat/docker/nodejs10docker/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 = 'nodejs10docker'
-apply from: '../../../../gradle/docker.gradle'
diff --git a/tests/dat/docker/nodejs10docker/package.json b/tests/dat/docker/nodejs10docker/package.json
deleted file mode 100644
index ebfb5a4..0000000
--- a/tests/dat/docker/nodejs10docker/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "name": "testdocker",
- "version": "1.0.0",
- "main": "index.js",
- "dependencies": {
- "openwhisk": "2.0.0"
- }
-}
\ No newline at end of file
diff --git a/tests/src/test/scala/runtime/actionContainers/NodeJs10ActionContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/NodeJs10ActionContainerTests.scala
deleted file mode 100644
index a7bcc44..0000000
--- a/tests/src/test/scala/runtime/actionContainers/NodeJs10ActionContainerTests.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 NodeJs10ActionContainerTests extends NodeJsActionContainerTests {
- override lazy val nodejsContainerImageName = "action-nodejs-v10"
- override lazy val nodejsTestDockerImageName = "nodejs10docker"
-}
diff --git a/tests/src/test/scala/runtime/actionContainers/NodeJs10ConcurrentTests.scala b/tests/src/test/scala/runtime/actionContainers/NodeJs10ConcurrentTests.scala
deleted file mode 100644
index ffb3108..0000000
--- a/tests/src/test/scala/runtime/actionContainers/NodeJs10ConcurrentTests.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 NodeJs10ConcurrentTests extends NodeJsConcurrentTests {
- override lazy val nodejsContainerImageName = "action-nodejs-v10"
- override lazy val nodejsTestDockerImageName = "nodejs10docker"
-}