From 89cfdd7f0e046703e6fdeb3e895917b07eace06c Mon Sep 17 00:00:00 2001 From: Robin Speekenbrink Date: Tue, 6 Oct 2020 14:39:09 +0200 Subject: [PATCH] Support memory limit This adds the `--memory` / `-m` support for creating new mysql services. --- functions | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/functions b/functions index b8daf23..9777dfe 100755 --- a/functions +++ b/functions @@ -81,8 +81,12 @@ service_create_container() { local ROOTPASSWORD="$(service_root_password "$SERVICE")" local PASSWORD="$(service_password "$SERVICE")" local DATABASE_NAME="$(get_database_name "$SERVICE")" - - ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_HOST_ROOT/data:/var/lib/mysql" -v "$SERVICE_HOST_ROOT/$PLUGIN_CONFIG_SUFFIX:/etc/mysql/conf.d" -e "MYSQL_ROOT_PASSWORD=$ROOTPASSWORD" -e MYSQL_USER=mysql -e "MYSQL_PASSWORD=$PASSWORD" -e "MYSQL_DATABASE=$DATABASE_NAME" --env-file="$SERVICE_ROOT/ENV" -d --restart always --label dokku=service --label dokku.service=mysql "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION") + local MEMORY_LIMIT="" + if [[ ! -z $SERVICE_MEMORY ]]; then + MEMORY_LIMIT="-m ${SERVICE_MEMORY}" + fi + + ID=$(docker run --name "$SERVICE_NAME" "$MEMORY_LIMIT" -v "$SERVICE_HOST_ROOT/data:/var/lib/mysql" -v "$SERVICE_HOST_ROOT/$PLUGIN_CONFIG_SUFFIX:/etc/mysql/conf.d" -e "MYSQL_ROOT_PASSWORD=$ROOTPASSWORD" -e MYSQL_USER=mysql -e "MYSQL_PASSWORD=$PASSWORD" -e "MYSQL_DATABASE=$DATABASE_NAME" --env-file="$SERVICE_ROOT/ENV" -d --restart always --label dokku=service --label dokku.service=mysql "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION") echo "$ID" >"$SERVICE_ROOT/ID" dokku_log_verbose_quiet "Waiting for container to be ready"