Skip to content

Commit

Permalink
Merge pull request #165 from ONLYOFFICE/feature/increase-shm-size
Browse files Browse the repository at this point in the history
Increase shm size to 2 gigabyte
  • Loading branch information
ShockwaveNN authored Nov 18, 2016
2 parents 6335e5f + 4b8a023 commit a4eff6b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
## New features
* Use `--shm-size` option for `docker run` for increasing it. Remove old code for increase shm by runtime.
Need to use docker v1.10.0 or newer for it (https://github.com/docker/docker/pull/16168)
* Increase `shm-size` to 2 gigabyte
* Docker rm executed containers after finish task
* Add ability to send custom portal name to spec. It use enviroment variable `SPEC_SERVER_IP`.
You should implement parsing it in your tests, to correctly run tests on customs ip.
Expand Down
2 changes: 1 addition & 1 deletion app/server/managers/test_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def docker_command(command)
docker_keys = '--privileged=true '\
'-v /mnt/data_share:/mnt/data_share '\
'--rm '\
'--shm-size=512m'
'--shm-size=2g'
'docker rm -f $(docker ps -a -q); '\
'docker pull onlyofficetestingrobot/nct-at-testing-node; '\
"docker run #{docker_keys} onlyofficetestingrobot/nct-at-testing-node "\
Expand Down

0 comments on commit a4eff6b

Please sign in to comment.