create container if not exists on service:start
This commit is contained in:
11
commands
11
commands
@@ -40,21 +40,12 @@ case "$1" in
|
|||||||
chmod 640 "$SERVICE_ROOT/ROOTPASSWORD" "$SERVICE_ROOT/PASSWORD"
|
chmod 640 "$SERVICE_ROOT/ROOTPASSWORD" "$SERVICE_ROOT/PASSWORD"
|
||||||
touch "$LINKS_FILE"
|
touch "$LINKS_FILE"
|
||||||
|
|
||||||
dokku_log_info1 "Starting container"
|
|
||||||
if [[ -n $MYSQL_CUSTOM_ENV ]]; then
|
if [[ -n $MYSQL_CUSTOM_ENV ]]; then
|
||||||
echo "$MYSQL_CUSTOM_ENV" | tr ';' "\n" > "$SERVICE_ROOT/ENV"
|
echo "$MYSQL_CUSTOM_ENV" | tr ';' "\n" > "$SERVICE_ROOT/ENV"
|
||||||
else
|
else
|
||||||
echo "" > "$SERVICE_ROOT/ENV"
|
echo "" > "$SERVICE_ROOT/ENV"
|
||||||
fi
|
fi
|
||||||
SERVICE_NAME=$(get_service_name "$SERVICE")
|
service_create_container "$SERVICE"
|
||||||
ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_ROOT/data:/var/lib/mysql" -v "$SERVICE_ROOT/config:/etc/mysql/conf.d" -e "MYSQL_ROOT_PASSWORD=$rootpassword" -e MYSQL_USER=mysql -e "MYSQL_PASSWORD=$password" -e "MYSQL_DATABASE=$SERVICE" --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"
|
|
||||||
docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" dokkupaas/wait > /dev/null
|
|
||||||
|
|
||||||
dokku_log_info2 "$PLUGIN_SERVICE container created: $SERVICE"
|
|
||||||
dokku "$PLUGIN_COMMAND_PREFIX:info" "$SERVICE"
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
$PLUGIN_COMMAND_PREFIX:destroy)
|
$PLUGIN_COMMAND_PREFIX:destroy)
|
||||||
|
|||||||
39
functions
39
functions
@@ -150,7 +150,7 @@ service_status() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
service_port_expose() {
|
service_port_expose() {
|
||||||
service_start "$1"
|
service_start "$1" "true"
|
||||||
service_port_unpause "$1" "true" "${@:2}"
|
service_port_unpause "$1" "true" "${@:2}"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,27 +219,54 @@ docker_ports_options() {
|
|||||||
|
|
||||||
service_start() {
|
service_start() {
|
||||||
local SERVICE="$1"
|
local SERVICE="$1"
|
||||||
|
local QUIET="$2"
|
||||||
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
|
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
|
||||||
local SERVICE_NAME=$(get_service_name "$SERVICE")
|
local SERVICE_NAME=$(get_service_name "$SERVICE")
|
||||||
local ID=$(docker ps -f status=running | grep "$SERVICE_NAME" | awk '{print $1}') || true
|
local ID=$(docker ps -f status=running | grep -e "$SERVICE_NAME$" | awk '{print $1}') || true
|
||||||
[[ -n $ID ]] && dokku_log_warn "Service is already started" && return 0
|
if [[ -n $ID ]]; then
|
||||||
|
[[ -z $QUIET ]] && dokku_log_warn "Service is already started"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
dokku_log_info1_quiet "Starting container"
|
dokku_log_info1_quiet "Starting container"
|
||||||
local PREVIOUS_ID=$(docker ps -f status=exited | grep "$SERVICE_NAME" | awk '{print $1}') || true
|
local PREVIOUS_ID=$(docker ps -f status=exited | grep -e "$SERVICE_NAME$" | awk '{print $1}') || true
|
||||||
|
local IMAGE_EXISTS=$(docker images | grep -e "^$PLUGIN_IMAGE " | grep -q " $PLUGIN_IMAGE_VERSION " && true)
|
||||||
|
local ROOTPASSWORD=$(cat "$SERVICE_ROOT/ROOTPASSWORD")
|
||||||
|
local PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
|
||||||
|
|
||||||
if [[ -n $PREVIOUS_ID ]]; then
|
if [[ -n $PREVIOUS_ID ]]; then
|
||||||
docker start "$PREVIOUS_ID" > /dev/null
|
docker start "$PREVIOUS_ID" > /dev/null
|
||||||
service_port_unpause "$SERVICE"
|
service_port_unpause "$SERVICE"
|
||||||
dokku_log_info2 "Container started"
|
dokku_log_info2 "Container started"
|
||||||
|
elif $IMAGE_EXISTS && [[ -n "$ROOTPASSWORD" ]] && [[ -n "$PASSWORD" ]]; then
|
||||||
|
service_create_container "$SERVICE"
|
||||||
else
|
else
|
||||||
dokku_log_verbose_quiet "No container exists for $SERVICE"
|
dokku_log_verbose_quiet "Neither container nor valid configuration exists for $SERVICE"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
service_create_container() {
|
||||||
|
local SERVICE="$1"
|
||||||
|
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
|
||||||
|
local SERVICE_NAME=$(get_service_name "$SERVICE")
|
||||||
|
local ROOTPASSWORD=$(cat "$SERVICE_ROOT/ROOTPASSWORD")
|
||||||
|
local PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
|
||||||
|
|
||||||
|
ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_ROOT/data:/var/lib/mysql" -v "$SERVICE_ROOT/config:/etc/mysql/conf.d" -e "MYSQL_ROOT_PASSWORD=$ROOTPASSWORD" -e MYSQL_USER=mysql -e "MYSQL_PASSWORD=$PASSWORD" -e "MYSQL_DATABASE=$SERVICE" --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"
|
||||||
|
docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" dokkupaas/wait > /dev/null
|
||||||
|
|
||||||
|
dokku_log_info2 "$PLUGIN_SERVICE container created: $SERVICE"
|
||||||
|
dokku "$PLUGIN_COMMAND_PREFIX:info" "$SERVICE"
|
||||||
|
}
|
||||||
|
|
||||||
service_stop() {
|
service_stop() {
|
||||||
local SERVICE="$1"
|
local SERVICE="$1"
|
||||||
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE";
|
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE";
|
||||||
local SERVICE_NAME=$(get_service_name "$SERVICE")
|
local SERVICE_NAME=$(get_service_name "$SERVICE")
|
||||||
local ID=$(docker ps -f status=running | grep "$SERVICE_NAME" | awk '{print $1}') || true
|
local ID=$(docker ps -f status=running | grep -e "$SERVICE_NAME$" | awk '{print $1}') || true
|
||||||
[[ -z $ID ]] && dokku_log_warn "Service is already stopped" && return 0
|
[[ -z $ID ]] && dokku_log_warn "Service is already stopped" && return 0
|
||||||
|
|
||||||
if [[ -n $ID ]]; then
|
if [[ -n $ID ]]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user