Skip to content

Commit

Permalink
yegor256#901 make rultor run docker container in in tty mode
Browse files Browse the repository at this point in the history
  • Loading branch information
original-brownbear committed Feb 24, 2016
1 parent 6f3c082 commit 8883eb3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/main/resources/com/rultor/agents/req/_head.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ function docker_when_possible {
if docker ps --filter=status=exited | grep --quiet "\s${container}\s*\$"; then
docker rm -f "${container}"
fi
docker run --rm -v "$(pwd):/main" "${vars[@]}" \
docker run -t --rm -v "$(pwd):/main" "${vars[@]}" \
--hostname=docker \
--memory=6g --memory-swap=16g --oom-kill-disable \
"--cidfile=$(pwd)/cid" -w=/main \
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/com/rultor/agents/req/StartsRequestTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,10 @@ public void startsDeployRequest() throws Exception {
.with(Matchers.containsString("docker_when_possible\n"))
.with(Matchers.containsString("load average is "))
.with(Matchers.containsString("low enough to run a"))
.with(Matchers.containsString("DOCKER-2: -t"))
.with(
Matchers.containsString(
"DOCKER-5: --env=MAVEN_OPTS=-Xmx2g -Xms1g"
"DOCKER-6: --env=MAVEN_OPTS=-Xmx2g -Xms1g"
)
)
.with(Matchers.containsString("useradd"))
Expand Down

0 comments on commit 8883eb3

Please sign in to comment.