Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump nodejs to 6.11.0 LTS #2078

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ node_modules

# IntelliJ
.idea
*.class

# Ansible
ansible/environments/docker-machine/hosts
Expand Down
90 changes: 43 additions & 47 deletions core/nodejs6Action/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,78 +1,74 @@
FROM nodejsactionbase

# based on https://github.com/nodejs/docker-node
ENV NODE_VERSION 6.9.1
RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
ENV NODE_VERSION 6.11.0
ENV NODE_URL_DOWNLOAD https://nodejs.org/dist

RUN curl -SLO "$NODE_URL_DOWNLOAD/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 npm install .

RUN npm install \
[email protected].2 \
async@2.1.4 \
body-parser@1.15.2 \
[email protected].4 \
async@2.5.0 \
body-parser@1.17.2 \
[email protected] \
[email protected] \
cloudant@1.6.2 \
commander@2.9.0 \
consul@0.27.0 \
cloudant@1.8.0 \
commander@2.10.0 \
consul@0.29.0 \
[email protected] \
[email protected] \
[email protected] \
express@4.14.0 \
express-session@1.14.2 \
[email protected].1 \
express@4.15.3 \
express-session@1.15.3 \
[email protected].2 \
[email protected] \
[email protected].2 \
log4js@0.6.38 \
[email protected].15 \
[email protected].4 \
log4js@1.1.1 \
[email protected].18 \
[email protected] \
[email protected] \
moment@2.17.0 \
[email protected].11 \
moment@2.18.1 \
[email protected].29 \
[email protected] \
nano@6.2.0 \
[email protected].7 \
nodemailer@2.6.4 \
nano@6.3.0 \
[email protected].8 \
nodemailer@4.0.1 \
[email protected] \
openwhisk@3.3.2 \
openwhisk@3.6.0 \
[email protected] \
[email protected].9 \
pug@">=2.0.0-beta6 <2.0.1" \
redis@2.6.3 \
request@2.79.0 \
request-promise@4.1.1 \
rimraf@2.5.4 \
[email protected].10 \
pug@">=2.0.0-beta11 <2.0.1" \
redis@2.7.1 \
request@2.81.0 \
request-promise@4.2.1 \
rimraf@2.6.1 \
[email protected] \
sendgrid@4.7.1 \
serve-favicon@2.3.2 \
socket.io@1.6.0 \
socket.io-client@1.6.0 \
superagent@3.0.0 \
sendgrid@5.1.1 \
serve-favicon@2.4.3 \
socket.io@2.0.3 \
socket.io-client@2.0.3 \
superagent@3.5.2 \
[email protected] \
[email protected] \
twilio@2.11.1 \
twilio@3.4.0 \
[email protected] \
uuid@3.0.0 \
validator@6.1.0 \
watson-developer-cloud@2.29.0 \
[email protected].7 \
[email protected].0 \
ws@1.1.1 \
uuid@3.1.0 \
validator@7.2.0 \
watson-developer-cloud@2.32.1 \
[email protected].8 \
[email protected].1 \
ws@3.0.0 \
[email protected] \
[email protected] \
[email protected]
[email protected] \
--save-exact \
&& npm cache clean

# See app.js
CMD node --expose-gc app.js
6 changes: 6 additions & 0 deletions core/nodejsActionBase/.dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
Dockerfile
build.gradle
.project
.settings
build.xml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can safely remove this, we're not using ant anymore.

README
node_modules
logs
8 changes: 4 additions & 4 deletions core/nodejsActionBase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "nodejsAction",
"version": "0.0.1",
"dependencies": {
"body-parser": "1.15.2",
"body-parser": "1.17.2",
"btoa": "1.1.2",
"express": "4.14.0",
"log4js": "0.6.38",
"request": "2.79.0"
"express": "4.15.3",
"log4js": "1.1.1",
"request": "2.81.0"
}
}