diff options
Diffstat (limited to 'start-container-docker.sh')
-rwxr-xr-x | start-container-docker.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/start-container-docker.sh b/start-container-docker.sh index b106e80d..8d26cffb 100755 --- a/start-container-docker.sh +++ b/start-container-docker.sh @@ -16,7 +16,7 @@ set -e # and returns shell statements to export the related variables. In # this case, it also defines ${SSH_AGENT_CLEANUP}. usage() { - echo "Usage: $0 --arch container-arch --distro flavour [--session-host host] [--session-name name] [--task {build|test}] [--memory XXXX]" + echo "Usage: $0 --arch container-arch --distro flavour [--session-host host] [--session-name name] [--task {build|test}]" echo echo " container-arch: architecture (eg: amd64, i386, arm64, armhf)" echo " distro: distribution (eg: trusty)" @@ -24,7 +24,6 @@ usage() { echo " useful if the name resolution does not work correctly" echo " session-name: session, in case the default '$BUILD_NUMBER-$JOB_NAME' is not suitable" echo " task: type of container (build or test, default=build)" - echo " memory: limit memory usage to XXXX MB, defaults to 7500" exit 1 } @@ -39,7 +38,6 @@ distro= session_host= session_name= task="build" -memory=7500 while [ $# -ge 1 ] do @@ -69,11 +67,6 @@ do [ x${task} = x ] && usage shift 2 ;; - --memory) - memory=$2 - [ x${memory} = x ] && usage - shift 2 - ;; *) echo "Unsupported option: $1" usage @@ -131,7 +124,7 @@ session_id=$($DOCKER run --name $session_name -dtP \ -v $HOME/snapshots-ref:$HOME/snapshots-ref:ro \ -v $WORKSPACE:$WORKSPACE \ ${SECURITY} \ - --memory=${memory}M --pids-limit=5000 \ + --memory=7500M --pids-limit=5000 \ $image) if [ x"$session_id" = x ]; then |