From e2316a3de857e67a44a932e92cac28f090bf78a7 Mon Sep 17 00:00:00 2001
From: muawiakh <amuawiakhan@gmail.com>
Date: Thu, 4 Jan 2018 13:58:28 +0100
Subject: [PATCH] Fix error checking of optional parameter
 `storage-engine-cache-size`

- Keep the parameter optional
- Remove redundant checking of the same parameter
- Do not exit if the parameter is not specified
---
 k8s/mongodb/container/Dockerfile                 | 2 +-
 k8s/mongodb/container/docker_build_and_push.bash | 4 ++--
 k8s/mongodb/container/mongod_entrypoint.bash     | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/k8s/mongodb/container/Dockerfile b/k8s/mongodb/container/Dockerfile
index 9d9d35f5..cf4aad42 100644
--- a/k8s/mongodb/container/Dockerfile
+++ b/k8s/mongodb/container/Dockerfile
@@ -1,4 +1,4 @@
-FROM mongo:3.4.4
+FROM mongo:3.4.10
 LABEL maintainer "dev@bigchaindb.com"
 WORKDIR /
 RUN apt-get update \
diff --git a/k8s/mongodb/container/docker_build_and_push.bash b/k8s/mongodb/container/docker_build_and_push.bash
index 680fab22..bb48dd2f 100755
--- a/k8s/mongodb/container/docker_build_and_push.bash
+++ b/k8s/mongodb/container/docker_build_and_push.bash
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-docker build -t bigchaindb/mongodb:3.2 .
+docker build -t bigchaindb/mongodb:3.3 .
 
-docker push bigchaindb/mongodb:3.2
+docker push bigchaindb/mongodb:3.3
diff --git a/k8s/mongodb/container/mongod_entrypoint.bash b/k8s/mongodb/container/mongod_entrypoint.bash
index bde5259a..e8516a82 100755
--- a/k8s/mongodb/container/mongod_entrypoint.bash
+++ b/k8s/mongodb/container/mongod_entrypoint.bash
@@ -65,9 +65,8 @@ if [[ -z "${REPLICA_SET_NAME:?REPLICA_SET_NAME not specified. Exiting!}" || \
     -z "${MONGODB_IP:?MONGODB_IP not specified. Exiting!}" || \
     -z "${MONGODB_KEY_FILE_PATH:?MONGODB_KEY_FILE_PATH not specified. Exiting!}" || \
     -z "${MONGODB_CA_FILE_PATH:?MONGODB_CA_FILE_PATH not specified. Exiting!}" || \
-    -z "${MONGODB_CRL_FILE_PATH:?MONGODB_CRL_FILE_PATH not specified. Exiting!}" || \
-    -z ${STORAGE_ENGINE_CACHE_SIZE:=''} ]] ; then
-    #-z "${MONGODB_KEY_FILE_PASSWORD:?MongoDB Key File Password not specified. Exiting!}" || \
+    -z "${MONGODB_CRL_FILE_PATH:?MONGODB_CRL_FILE_PATH not specified. Exiting!}" ]] ; then
+  echo "Missing required enviroment variable(s)."
   exit 1
 else
   echo REPLICA_SET_NAME="$REPLICA_SET_NAME"