From e61190a1a1079477f489c486aa1d79075753e09c Mon Sep 17 00:00:00 2001 From: Ben Parees Date: Wed, 13 Jul 2016 13:24:50 -0400 Subject: [PATCH] use latest imagestreams for nodejs and mongo (#56) * use latest mongo and nodejs versions * update readiness check for mongo 3.2 --- openshift/templates/nodejs-mongodb.json | 6 +++--- openshift/templates/nodejs.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openshift/templates/nodejs-mongodb.json b/openshift/templates/nodejs-mongodb.json index b2b9f24..6ab4a17 100644 --- a/openshift/templates/nodejs-mongodb.json +++ b/openshift/templates/nodejs-mongodb.json @@ -83,7 +83,7 @@ "from": { "kind": "ImageStreamTag", "namespace": "${NAMESPACE}", - "name": "nodejs:0.10" + "name": "nodejs:4" }, "env": [ { @@ -271,7 +271,7 @@ "from": { "kind": "ImageStreamTag", "namespace": "${NAMESPACE}", - "name": "mongodb:2.6" + "name": "mongodb:3.2" } } }, @@ -322,7 +322,7 @@ "timeoutSeconds": 1, "initialDelaySeconds": 3, "exec": { - "command": [ "/bin/sh", "-i", "-c", "mongostat --host 127.0.0.1 -u admin -p ${DATABASE_ADMIN_PASSWORD} -n 1 --noheaders"] + "command": [ "/bin/sh", "-i", "-c", "mongo 127.0.0.1:27017/$MONGODB_DATABASE -u $MONGODB_USER -p $MONGODB_PASSWORD --eval=\"quit()\""] } }, "livenessProbe": { diff --git a/openshift/templates/nodejs.json b/openshift/templates/nodejs.json index 08c7d31..ec262e4 100644 --- a/openshift/templates/nodejs.json +++ b/openshift/templates/nodejs.json @@ -83,7 +83,7 @@ "from": { "kind": "ImageStreamTag", "namespace": "${NAMESPACE}", - "name": "nodejs:0.10" + "name": "nodejs:4" }, "env": [ {