From 09936b37faabf7081f09bb98a0ac8153348f51ae Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Thu, 7 Jan 2016 18:00:12 -0800 Subject: [PATCH 1/2] update nodejs in test apps --- tests/apps/checks-root/package.json | 3 +-- tests/apps/config/package.json | 3 +-- tests/apps/dockerfile-noexpose/package.json | 2 +- tests/apps/dockerfile/package.json | 2 +- tests/apps/gitsubmodules/package.json | 3 +-- tests/apps/multi/package.json | 2 +- tests/apps/nodejs-express-noprocfile/package.json | 3 +-- tests/apps/nodejs-express/package.json | 3 +-- tests/apps/nodejs-worker/package.json | 3 +-- 9 files changed, 9 insertions(+), 15 deletions(-) diff --git a/tests/apps/checks-root/package.json b/tests/apps/checks-root/package.json index bcf229757..d378c6327 100644 --- a/tests/apps/checks-root/package.json +++ b/tests/apps/checks-root/package.json @@ -5,8 +5,7 @@ "express": "4.x" }, "engines": { - "node": "0.12.x", - "npm": "2.x" + "node": "4.2.x" }, "scripts": { "start": "node index.js" diff --git a/tests/apps/config/package.json b/tests/apps/config/package.json index eb17caf0c..ce01f3afa 100644 --- a/tests/apps/config/package.json +++ b/tests/apps/config/package.json @@ -5,7 +5,6 @@ "express": "2.5.x" }, "engines": { - "node": "0.10.x", - "npm": "2.7.x" + "node": "4.2.x" } } diff --git a/tests/apps/dockerfile-noexpose/package.json b/tests/apps/dockerfile-noexpose/package.json index 29e7c9f3e..84913e3a0 100644 --- a/tests/apps/dockerfile-noexpose/package.json +++ b/tests/apps/dockerfile-noexpose/package.json @@ -10,7 +10,7 @@ "express": "^4.0.0" }, "engines": { - "node": "0.10.x" + "node": "4.2.x" }, "repository": { "type": "git", diff --git a/tests/apps/dockerfile/package.json b/tests/apps/dockerfile/package.json index 29e7c9f3e..84913e3a0 100644 --- a/tests/apps/dockerfile/package.json +++ b/tests/apps/dockerfile/package.json @@ -10,7 +10,7 @@ "express": "^4.0.0" }, "engines": { - "node": "0.10.x" + "node": "4.2.x" }, "repository": { "type": "git", diff --git a/tests/apps/gitsubmodules/package.json b/tests/apps/gitsubmodules/package.json index ca800a5df..746045c51 100644 --- a/tests/apps/gitsubmodules/package.json +++ b/tests/apps/gitsubmodules/package.json @@ -5,7 +5,6 @@ "express": "~3.3.4" }, "engines": { - "node": "0.10.x", - "npm": "2.7.x" + "node": "4.2.x" } } diff --git a/tests/apps/multi/package.json b/tests/apps/multi/package.json index 84a290444..4d8c40791 100644 --- a/tests/apps/multi/package.json +++ b/tests/apps/multi/package.json @@ -10,7 +10,7 @@ }, "description": "Test application for heroku multi buildpack.", "engines": { - "node": "~0.10.30" + "node": "4.2.x" }, "license": "ISC", "name": "test-buildpack-multi", diff --git a/tests/apps/nodejs-express-noprocfile/package.json b/tests/apps/nodejs-express-noprocfile/package.json index 6f8ca43e1..c4c1a905a 100644 --- a/tests/apps/nodejs-express-noprocfile/package.json +++ b/tests/apps/nodejs-express-noprocfile/package.json @@ -5,8 +5,7 @@ "express": "2.5.x" }, "engines": { - "node": "0.10.x", - "npm": "2.7.x" + "node": "4.2.x" }, "scripts": { "start": "node web.js" diff --git a/tests/apps/nodejs-express/package.json b/tests/apps/nodejs-express/package.json index eb17caf0c..ce01f3afa 100644 --- a/tests/apps/nodejs-express/package.json +++ b/tests/apps/nodejs-express/package.json @@ -5,7 +5,6 @@ "express": "2.5.x" }, "engines": { - "node": "0.10.x", - "npm": "2.7.x" + "node": "4.2.x" } } diff --git a/tests/apps/nodejs-worker/package.json b/tests/apps/nodejs-worker/package.json index a02e1894b..b69ca2216 100644 --- a/tests/apps/nodejs-worker/package.json +++ b/tests/apps/nodejs-worker/package.json @@ -2,7 +2,6 @@ "name": "node-example", "version": "0.0.1", "engines": { - "node": "0.10.x", - "npm": "2.7.x" + "node": "4.2.x" } } From 8562afde382821c4671680f173d3d2375d771224 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Thu, 7 Jan 2016 19:43:56 -0800 Subject: [PATCH 2/2] disable debug on docker daemon to avoid additional IO --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index d243c57e2..6529b31d8 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: pre: - - echo 'DOCKER_OPTS="-s btrfs -e lxc -D --userland-proxy=false"' | sudo tee -a /etc/default/docker + - echo 'DOCKER_OPTS="-s btrfs -e lxc --userland-proxy=false"' | sudo tee -a /etc/default/docker - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci-cp-workaround' - sudo chmod 0755 /usr/bin/docker services: