1
0
Эх сурвалжийг харах

Merge pull request #1559 from wglambert/mongodocs_EXECUTOR

Replace --smallfiles with --serviceExecutor
Tianon Gravi 6 жил өмнө
parent
commit
f3b327bbc9

+ 2 - 1
.travis/check-pr-no-readme.sh

@@ -4,7 +4,8 @@ set -Eeuo pipefail
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")/.."
 
 if [ "$TRAVIS_PULL_REQUEST" != 'false' ]; then
-	if [ "$(git diff --numstat "$TRAVIS_COMMIT_RANGE" -- '*/README.md')" ]; then
+	git fetch -q https://github.com/docker-library/docs.git master
+	if [ -n "$(git diff --numstat FETCH_HEAD...HEAD -- '*/README.md')" ]; then
 		echo >&2 'Error: at least one repo README.md has changed'
 		echo >&2 'These files are autogenerated, so it is unnecessary to modify them'
 		echo >&2 'Please update content.md and docker-library-bot will take care of README.md'

+ 3 - 3
mongo/content.md

@@ -52,10 +52,10 @@ See the [MongoDB manual](https://docs.mongodb.com/manual/) for information on us
 
 ## Customize configuration without configuration file
 
-Most MongoDB configuration can be set through flags to `mongod`. The entrypoint of the image is created to pass its arguments along to `mongod`. See below an example of setting MongoDB to use a [smaller default file size](https://docs.mongodb.com/manual/reference/program/mongod/#cmdoption-mongod-smallfiles) via `docker run`.
+Most MongoDB configuration can be set through flags to `mongod`. The entrypoint of the image is created to pass its arguments along to `mongod`. See below an example of setting MongoDB to use a different [threading and execution model](https://docs.mongodb.com/manual/reference/program/mongod/#cmdoption-mongod-serviceexecutor) via `docker run`.
 
 ```console
-$ docker run --name some-%%REPO%% -d %%IMAGE%% --smallfiles
+$ docker run --name some-%%REPO%% -d %%IMAGE%% --serviceExecutor adaptive
 ```
 
 And here is the same with a `docker-compose.yml` file
@@ -65,7 +65,7 @@ version: '3.1'
 services:
   mongo:
     image: %%IMAGE%%
-    command: --smallfiles
+    command: --serviceExecutor adaptive
 ```
 
 To see the full list of possible options, check the MongoDB manual on [`mongod`](https://docs.mongodb.com/manual/reference/program/mongod/) or check the `--help` output of `mongod`: