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 e8e3d13 remove NodeJS v6 (#164)
e8e3d13 is described below
commit e8e3d13292476f64b8c7152f97fd22dd1eb4a35d
Author: David Grove <[email protected]>
AuthorDate: Tue Feb 18 08:03:04 2020 -0500
remove NodeJS v6 (#164)
NodeJS 6 went EOL in April of 2019; time to remove
support from master branch.
---
.travis.yml | 2 +-
README.md | 12 +-
core/nodejs6Action/CHANGELOG.md | 185 ---------------------
core/nodejs6Action/Dockerfile | 97 -----------
core/nodejs6Action/build.gradle | 28 ----
settings.gradle | 2 -
tests/dat/docker/nodejs6docker/Dockerfile | 19 ---
tests/dat/docker/nodejs6docker/build.gradle | 19 ---
tests/dat/docker/nodejs6docker/package.json | 8 -
.../NodeJs6ActionContainerTests.scala | 28 ----
.../actionContainers/NodeJs6ConcurrentTests.scala | 27 ---
tools/travis/publish.sh | 4 +-
12 files changed, 3 insertions(+), 428 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f03c229..21f96db 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 6 nightly &&
./tools/travis/publish.sh openwhisk 8 nightly && ./tools/travis/publish.sh
openwhisk 10 nightly && ./tools/travis/publish.sh openwhisk 12 nightly"
+ script: "./tools/travis/publish.sh openwhisk 8 nightly &&
./tools/travis/publish.sh openwhisk 10 nightly && ./tools/travis/publish.sh
openwhisk 12 nightly"
on:
branch: master
repo: apache/openwhisk-runtime-nodejs
diff --git a/README.md b/README.md
index 8871795..595f2df 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 6.17.1 (`nodejs:6 ` & `openwhisk/nodejs6action`)
- Node.js 8.16.1 (`nodejs:8` & `openwhisk/action-nodejs-v8`)
- Node.js 10.16.3 (`nodejs:10` & `openwhisk/action-nodejs-v10`)
- Node.js 12.8.1 (`nodejs:12` & `openwhisk/action-nodejs-v12`)
@@ -39,12 +38,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 v6
-
-```
-wsk action update myAction myAction.js --kind nodejs:6
-```
-
### Node.js v8
```
@@ -67,7 +60,6 @@ wsk action update myAction myAction.js --kind nodejs:12
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/nodejs6action](https://hub.docker.com/r/openwhisk/nodejs6action)
-
[https://hub.docker.com/r/openwhisk/action-nodejs-v8](https://hub.docker.com/r/openwhisk/action-nodejs-v8)
-
[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)
@@ -97,13 +89,12 @@ 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:nodejs6Action:distDocker
./gradlew core:nodejs8Action:distDocker
./gradlew core:nodejs10Action:distDocker
./gradlew core:nodejs12Action:distDocker
```
-This will return the following runtime images with the following names:
`nodejs6action`, `action-nodejs-v8`, `action-nodejs-v10` and
`action-nodejs-v12`.
+This will return the following runtime images with the following names:
`action-nodejs-v8`, `action-nodejs-v10` and `action-nodejs-v12`.
### Testing
@@ -119,7 +110,6 @@ This will return the following runtime images with the
following names: `nodejs6
- Build the custom Docker images used in local testing.
```
-./gradlew tests:dat:docker:nodejs6docker:distDocker
./gradlew tests:dat:docker:nodejs8docker:distDocker
./gradlew tests:dat:docker:nodejs10docker:distDocker
./gradlew tests:dat:docker:nodejs12docker:distDocker
diff --git a/core/nodejs6Action/CHANGELOG.md b/core/nodejs6Action/CHANGELOG.md
deleted file mode 100644
index f2e0925..0000000
--- a/core/nodejs6Action/CHANGELOG.md
+++ /dev/null
@@ -1,185 +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 6 OpenWhisk Runtime Container
-
-## Apache 1.13
-Changes:
-- Update Node.js
-- Update openwhisk npm package
-
-- [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 = [6.17.1](https://nodejs.org/en/blog/release/v6.17.1/)
-
-## 1.12.0
-Change: Update npm openwhisk package from `3.16.0` to `3.17.0`
-
-- [openwhisk v3.17.0](https://www.npmjs.com/package/openwhisk) - JavaScript
client library for the OpenWhisk platform. Provides a wrapper around the
OpenWhisk APIs.
-
-## 1.11.3
-Change: Update Node.js
-
-Node.js version = [6.14.4](https://nodejs.org/en/blog/release/v6.14.4/)
-
-## 1.11.2
-Change: Update runtime to allow more environment variables
-
-- Update run handler to accept more environment variables
[#78](https://github.com/apache/openwhisk-runtime-nodejs/pull/78)
-
-## 1.11.1
-Change: Update runtime to put runtime npm modules at root level, user npm
modules at container invocation level
-
-- Don't override runtime npm packages when user provides their own
[#73](https://github.com/apache/openwhisk-runtime-nodejs/pull/73/files)
-
-## 1.11.0
-Change: Update runtime to work in concurrent mode
-
-- Update runtime to work in concurrent mode
[#41](https://github.com/apache/openwhisk-runtime-nodejs/pull/41/files)
-
-## 1.10.0
-Change: Update npm openwhisk package from `3.15.0` to `3.16.0`
-
-- [openwhisk v3.16.0](https://www.npmjs.com/package/openwhisk) - JavaScript
client library for the OpenWhisk platform. Provides a wrapper around the
OpenWhisk APIs.
-
-## 1.9.3
-Changes:
- - Disallow re-initialization.
- - Fix bug where some log messages appear after the log maker.
-
-## 1.9.2
-Change: Update Node.js
-
-Node.js version = 6.14.3
-
-## 1.9.1
-Change: Update Node.js
-
-Node.js version = 6.14.2
-
-## 1.9.0
-Change: Update npm openwhisk package from `3.14.0` to `3.15.0`
-
-- [openwhisk v3.15.0](https://www.npmjs.com/package/openwhisk) - JavaScript
client library for the OpenWhisk platform. Provides a wrapper around the
OpenWhisk APIs.
-
-## 1.8.1
-Change: Update Node.js
-
-Node.js version = 6.14.1
-
-## 1.8.0
-Change: Update Node.js
-
-Node.js version = 6.14.0
-
-## 1.7.0
-Change: Update npm openwhisk package
-
-- [openwhisk v3.14.0](https://www.npmjs.com/package/openwhisk) - JavaScript
client library for the OpenWhisk platform. Provides a wrapper around the
OpenWhisk APIs.
-
-## 1.6.0
-Change: Update npm openwhisk package
-
-- [openwhisk v3.13.1](https://www.npmjs.com/package/openwhisk) - JavaScript
client library for the OpenWhisk platform. Provides a wrapper around the
OpenWhisk APIs.
-
-## 1.5.0
-Change: Update npm openwhisk package
-
-- [openwhisk v3.12.0](https://www.npmjs.com/package/openwhisk) - JavaScript
client library for the OpenWhisk platform. Provides a wrapper around the
OpenWhisk APIs.
-
-## 1.4.0
-Change: Update nodejs and openwhisk npm package
-
-Node version = 6.12.2
-
-- [openwhisk v3.11.0](https://www.npmjs.com/package/openwhisk) - JavaScript
client library for the OpenWhisk platform. Provides a wrapper around the
OpenWhisk APIs.
-
-## 1.3.0
-Change: Update openwhisk npm package
-
-Node version = 6.12.0
-
-- [openwhisk v3.10.0](https://www.npmjs.com/package/openwhisk) - JavaScript
client library for the OpenWhisk platform. Provides a wrapper around the
OpenWhisk APIs.
-
-## 1.2.0
-Change: Update openwhisk npm package
-
-Node version = 6.11.4
-
-- [openwhisk v3.9.0](https://www.npmjs.com/package/openwhisk) - JavaScript
client library for the OpenWhisk platform. Provides a wrapper around the
OpenWhisk APIs.
-
-## 1.1.0
-Change: Update NodeJS version
-
-Node version = 6.11.4
-## 1.0.0
-Change: Initial release
-
-Node version = 6.9.1
-- [apn v2.1.2](https://www.npmjs.com/package/apn) - A Node.js module for
interfacing with the Apple Push Notification service.
-- [async v2.1.4](https://www.npmjs.com/package/async) - Provides functions for
working with asynchronous functions.
-- [btoa v1.1.2](https://www.npmjs.com/package/btoa) - A port of the browser's
btoa function.
-- [cheerio v0.22.0](https://www.npmjs.com/package/cheerio) - Fast, flexible &
lean implementation of core jQuery designed specifically for the server.
-- [cloudant v1.6.2](https://www.npmjs.com/package/cloudant) - This is the
official Cloudant library for Node.js.
-- [commander v2.9.0](https://www.npmjs.com/package/commander) - The complete
solution for node.js command-line interfaces.
-- [consul v0.27.0](https://www.npmjs.com/package/consul) - A client for
Consul, involving service discovery and configuration.
-- [cookie-parser v1.4.3](https://www.npmjs.com/package/cookie-parser) - Parse
Cookie header and populate req.cookies with an object keyed by the cookie names.
-- [cradle v0.7.1](https://www.npmjs.com/package/cradle) - A high-level,
caching, CouchDB client for Node.js.
-- [errorhandler v1.5.0](https://www.npmjs.com/package/errorhandler) -
Development-only error handler middleware.
-- [glob v7.1.1](https://www.npmjs.com/package/glob) - Match files using the
patterns the shell uses, like stars and stuff.
-- [gm v1.23.0](https://www.npmjs.com/package/gm) - GraphicsMagick and
ImageMagick for Node.
-- [lodash v4.17.2](https://www.npmjs.com/package/lodash) - The Lodash library
exported as Node.js modules.
-- [log4js v0.6.38](https://www.npmjs.com/package/log4js) - This is a
conversion of the log4js framework to work with Node.
-- [iconv-lite v0.4.15](https://www.npmjs.com/package/iconv-lite) - Pure JS
character encoding conversion
-- [marked v0.3.6](https://www.npmjs.com/package/marked) - A full-featured
markdown parser and compiler, written in JavaScript. Built for speed.
-- [merge v1.2.0](https://www.npmjs.com/package/merge) - Merge multiple objects
into one, optionally creating a new cloned object.
-- [moment v2.17.0](https://www.npmjs.com/package/moment) - A lightweight
JavaScript date library for parsing, validating, manipulating, and formatting
dates.
-- [mongodb v2.2.11](https://www.npmjs.com/package/mongodb) - The official
MongoDB driver for Node.js.
-- [mustache v2.3.0](https://www.npmjs.com/package/mustache) - mustache.js is
an implementation of the mustache template system in JavaScript.
-- [nano v6.2.0](https://www.npmjs.com/package/nano) - minimalistic couchdb
driver for Node.js.
-- [node-uuid v1.4.7](https://www.npmjs.com/package/node-uuid) - Deprecated
UUID packaged.
-- [nodemailer v2.6.4](https://www.npmjs.com/package/nodemailer) - Send e-mails
from Node.js – easy as cake!
-- [oauth2-server v2.4.1](https://www.npmjs.com/package/oauth2-server) -
Complete, compliant and well tested module for implementing an OAuth2
Server/Provider with express in Node.js.
-- [openwhisk v3.3.2](https://www.npmjs.com/package/openwhisk) - JavaScript
client library for the OpenWhisk platform. Provides a wrapper around the
OpenWhisk APIs.
-- [pkgcloud v1.4.0](https://www.npmjs.com/package/pkgcloud) - pkgcloud is a
standard library for Node.js that abstracts away differences among multiple
cloud providers.
-- [process v0.11.9](https://www.npmjs.com/package/process) -
require('process'); just like any other module.
-- [pug v2.0.0-beta6](https://www.npmjs.com/package/pug) - Implements the Pug
templating language.
-- [redis v2.6.3](https://www.npmjs.com/package/redis) - This is a complete and
feature rich Redis client for Node.js.
-- [request v2.79.0](https://www.npmjs.com/package/request) - Request is
designed to be the simplest way possible to make HTTP calls.
-- [request-promise v4.1.1](https://www.npmjs.com/package/request-promise) -
The simplified HTTP request client 'request' with Promise support. Powered by
Bluebird.
-- [rimraf v2.5.4](https://www.npmjs.com/package/rimraf) - The UNIX command rm
-rf for node.
-- [semver v5.3.0](https://www.npmjs.com/package/semver) - Supports semantic
versioning.
-- [sendgrid v4.7.1](https://www.npmjs.com/package/sendgrid) - Provides email
support via the SendGrid API.
-- [serve-favicon v2.3.2](https://www.npmjs.com/package/serve-favicon) -
Node.js middleware for serving a favicon.
-- [socket.io v1.6.0](https://www.npmjs.com/package/socket.io) - Socket.IO
enables real-time bidirectional event-based communication.
-- [socket.io-client v1.6.0](https://www.npmjs.com/package/socket.io-client) -
Client-side support for Socket.IO.
-- [superagent v3.0.0](https://www.npmjs.com/package/superagent) - SuperAgent
is a small progressive client-side HTTP request library, and Node.js module
with the same API, sporting many high-level HTTP client features.
-- [swagger-tools v0.10.1](https://www.npmjs.com/package/swagger-tools) - Tools
related to working with Swagger, a way to document APIs.
-- [tmp v0.0.31](https://www.npmjs.com/package/tmp) - A simple temporary file
and directory creator for node.js.
-- [twilio v2.11.1](https://www.npmjs.com/package/twilio) - A wrapper for the
Twilio API, related to voice, video, and messaging.
-- [underscore v1.8.3](https://www.npmjs.com/package/underscore) -
Underscore.js is a utility-belt library for JavaScript that provides support
for the usual functional suspects (each, map, reduce, filter...) without
extending any core JavaScript objects.
-- [uuid v3.0.0](https://www.npmjs.com/package/uuid) - Simple, fast generation
of RFC4122 UUIDS.
-- [validator v6.1.0](https://www.npmjs.com/package/validator) - A library of
string validators and sanitizers.
-- [watson-developer-cloud
v2.29.0](https://www.npmjs.com/package/watson-developer-cloud) - Node.js client
library to use the Watson Developer Cloud services, a collection of APIs that
use cognitive computing to solve complex problems.
-- [when v3.7.7](https://www.npmjs.com/package/when) - When.js is a rock solid,
battle-tested Promises/A+ and when() implementation, including a complete ES6
Promise shim.
-- [winston v2.3.0](https://www.npmjs.com/package/winston) - A multi-transport
async logging library for node.js. "CHILL WINSTON! ... I put it in the logs."
-- [ws v1.1.1](https://www.npmjs.com/package/ws) - ws is a simple to use,
blazing fast, and thoroughly tested WebSocket client and server implementation.
-- [xml2js v0.4.17](https://www.npmjs.com/package/xml2js) - Simple XML to
JavaScript object converter. It supports bi-directional conversion.
-- [xmlhttprequest v1.8.0](https://www.npmjs.com/package/xmlhttprequest) -
node-XMLHttpRequest is a wrapper for the built-in http client to emulate the
browser XMLHttpRequest object.
-- [yauzl v2.7.0](https://www.npmjs.com/package/yauzl) - yet another unzip
library for node. For zipping.
diff --git a/core/nodejs6Action/Dockerfile b/core/nodejs6Action/Dockerfile
deleted file mode 100644
index d323330..0000000
--- a/core/nodejs6Action/Dockerfile
+++ /dev/null
@@ -1,97 +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 nodejsactionbase
-
-# based on https://github.com/nodejs/docker-node
-ENV NODE_VERSION 6.17.1
-RUN curl -SLO
"https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz"; \
- && tar -xzf "node-v$NODE_VERSION-linux-x64.tar.gz" -C /usr/local
--strip-components=1 \
- && rm "node-v$NODE_VERSION-linux-x64.tar.gz"
-
-
-# workaround for this: https://github.com/npm/npm/issues/9863
-RUN cd $(npm root -g)/npm \
- && npm install fs-extra \
- && sed -i -e s/graceful-fs/fs-extra/ -e s/fs\.rename/fs\.move/
./lib/utils/rename.js
-
-WORKDIR /nodejsAction
-
-# Install app dependencies
-RUN rm -rf .project .settings build.xml Dockerfile README node_modules logs
-RUN cd / && npm install .
-# In nodejsActionBase we copied the package.json file to the root of the
container, this is what we are installing here, as to not be overriden by user
set packages
-RUN cd / && npm install --no-package-lock \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
-pug@">=2.0.0-beta6 <2.0.1" \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected]
-
-
-# See app.js
-CMD node --expose-gc app.js
diff --git a/core/nodejs6Action/build.gradle b/core/nodejs6Action/build.gradle
deleted file mode 100644
index 1f1e22c..0000000
--- a/core/nodejs6Action/build.gradle
+++ /dev/null
@@ -1,28 +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 = 'nodejs6action'
-apply from: '../../gradle/docker.gradle'
-distDocker.dependsOn ':core:nodejsActionBase:distDocker'
diff --git a/settings.gradle b/settings.gradle
index 563a83e..da79f78 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,11 +18,9 @@
include 'tests'
include 'core:nodejsActionBase'
-include 'core:nodejs6Action'
include 'core:nodejs8Action'
include 'core:nodejs10Action'
include 'core:nodejs12Action'
-include 'tests:dat:docker:nodejs6docker'
include 'tests:dat:docker:nodejs8docker'
include 'tests:dat:docker:nodejs10docker'
include 'tests:dat:docker:nodejs12docker'
diff --git a/tests/dat/docker/nodejs6docker/Dockerfile
b/tests/dat/docker/nodejs6docker/Dockerfile
deleted file mode 100644
index a513cc4..0000000
--- a/tests/dat/docker/nodejs6docker/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 nodejs6action
-COPY package.json .
-RUN npm install --production
diff --git a/tests/dat/docker/nodejs6docker/build.gradle
b/tests/dat/docker/nodejs6docker/build.gradle
deleted file mode 100644
index 4e4b018..0000000
--- a/tests/dat/docker/nodejs6docker/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 = 'nodejs6docker'
-apply from: '../../../../gradle/docker.gradle'
diff --git a/tests/dat/docker/nodejs6docker/package.json
b/tests/dat/docker/nodejs6docker/package.json
deleted file mode 100644
index ebfb5a4..0000000
--- a/tests/dat/docker/nodejs6docker/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/NodeJs6ActionContainerTests.scala
b/tests/src/test/scala/runtime/actionContainers/NodeJs6ActionContainerTests.scala
deleted file mode 100644
index a8a26fb..0000000
---
a/tests/src/test/scala/runtime/actionContainers/NodeJs6ActionContainerTests.scala
+++ /dev/null
@@ -1,28 +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 NodeJs6ActionContainerTests extends NodeJsNonConcurrentTests {
-
- override lazy val nodejsContainerImageName = "nodejs6action"
- override lazy val nodejsTestDockerImageName = "nodejs6docker"
-}
diff --git
a/tests/src/test/scala/runtime/actionContainers/NodeJs6ConcurrentTests.scala
b/tests/src/test/scala/runtime/actionContainers/NodeJs6ConcurrentTests.scala
deleted file mode 100644
index e4c7252..0000000
--- a/tests/src/test/scala/runtime/actionContainers/NodeJs6ConcurrentTests.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 NodeJs6ConcurrentTests extends NodeJsConcurrentTests {
- override lazy val nodejsContainerImageName = "nodejs6action"
- override lazy val nodejsTestDockerImageName = "nodejs6docker"
-}
diff --git a/tools/travis/publish.sh b/tools/travis/publish.sh
index 6c4807d..9663aa0 100755
--- a/tools/travis/publish.sh
+++ b/tools/travis/publish.sh
@@ -30,9 +30,7 @@ IMAGE_PREFIX=$1
RUNTIME_VERSION=$2
IMAGE_TAG=$3
-if [ ${RUNTIME_VERSION} == "6" ]; then
- RUNTIME="nodejs6Action"
-elif [ ${RUNTIME_VERSION} == "8" ]; then
+if [ ${RUNTIME_VERSION} == "8" ]; then
RUNTIME="nodejs8Action"
elif [ ${RUNTIME_VERSION} == "10" ]; then
RUNTIME="nodejs10Action"
