Merge pull request #298 from yoz2326/master

Duplicated `--pidfile` during init if passed to mongod at startup
docker-library · Aug 30, 2018 · 9c95830 · 9c95830
2 parents f4e1d14 + 36a011c
commit 9c95830
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/3.2/docker-entrypoint.sh b/3.2/docker-entrypoint.sh
@@ -311,7 +311,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
 			echo
 		done
 
-		"$@" --pidfilepath="$pidfile" --shutdown
+		"${mongodHackedArgs[@]}" --shutdown
 		rm -f "$pidfile"
 
 		echo

diff --git a/3.4/docker-entrypoint.sh b/3.4/docker-entrypoint.sh
@@ -311,7 +311,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
 			echo
 		done
 
-		"$@" --pidfilepath="$pidfile" --shutdown
+		"${mongodHackedArgs[@]}" --shutdown
 		rm -f "$pidfile"
 
 		echo

diff --git a/3.6/docker-entrypoint.sh b/3.6/docker-entrypoint.sh
@@ -312,7 +312,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
 			echo
 		done
 
-		"$@" --pidfilepath="$pidfile" --shutdown
+		"${mongodHackedArgs[@]}" --shutdown
 		rm -f "$pidfile"
 
 		echo

diff --git a/4.0/docker-entrypoint.sh b/4.0/docker-entrypoint.sh
@@ -312,7 +312,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
 			echo
 		done
 
-		"$@" --pidfilepath="$pidfile" --shutdown
+		"${mongodHackedArgs[@]}" --shutdown
 		rm -f "$pidfile"
 
 		echo

diff --git a/4.1/docker-entrypoint.sh b/4.1/docker-entrypoint.sh
@@ -312,7 +312,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
 			echo
 		done
 
-		"$@" --pidfilepath="$pidfile" --shutdown
+		"${mongodHackedArgs[@]}" --shutdown
 		rm -f "$pidfile"
 
 		echo