Release 1.4.10

common-functions

@@ -283,6 +283,7 @@ service_container_rm() {
   [[ -z "$ID" ]] && return 0
 
   dokku_log_verbose_quiet "Removing container"
+  docker update --restart=no "$SERVICE_NAME" > /dev/null 2>&1
   if ! docker rm "$SERVICE_NAME" > /dev/null 2>&1; then
     dokku_log_fail "Unable to remove container for service $SERVICE"
   fi

functions

@@ -72,7 +72,7 @@ service_create_container() {
   local SERVICE_HOST_ROOT="$PLUGIN_DATA_HOST_ROOT/$SERVICE"
   local SERVICE_NAME="$(get_service_name "$SERVICE")"
 
-  ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_HOST_ROOT/data:/data" -v "$SERVICE_HOST_ROOT/config:/usr/local/etc/redis" --env-file="$SERVICE_ROOT/ENV" -d --restart always --label dokku=service --label dokku.service=redis "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" redis-server /usr/local/etc/redis/redis.conf --bind 0.0.0.0 --sysctl vm.overcommit_memory=1)
+  ID=$(docker run --name "$SERVICE_NAME" -v "$SERVICE_HOST_ROOT/data:/data" -v "$SERVICE_HOST_ROOT/config:/usr/local/etc/redis" --env-file="$SERVICE_ROOT/ENV" -d --restart always --label dokku=service --label dokku.service=redis "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" redis-server /usr/local/etc/redis/redis.conf --bind 0.0.0.0)
   echo "$ID" > "$SERVICE_ROOT/ID"
 
   dokku_log_verbose_quiet "Waiting for container to be ready"

help-functions

@@ -142,7 +142,7 @@ fn-help-contents-subcommand() {
 fn-help-fancy-tput() {
   declare desc="A wrapper around tput"
 
-  if [[ -z "$DOKKU_NO_COLOR" ]] || [[ "$TERM" = "unknown" ]] || [[ "$TERM" == "dumb" ]]; then
+  if [[ -n "$DOKKU_NO_COLOR" ]] || [[ "$TERM" = "unknown" ]] || [[ "$TERM" == "dumb" ]]; then
     return
   fi
 
@@ -152,7 +152,7 @@ fn-help-fancy-tput() {
 fn-help-fancy-color() {
   declare desc="A wrapper around colors"
 
-  if [[ -z "$DOKKU_NO_COLOR" ]] || [[ "$TERM" = "unknown" ]] || [[ "$TERM" == "dumb" ]]; then
+  if [[ -n "$DOKKU_NO_COLOR" ]] || [[ "$TERM" = "unknown" ]] || [[ "$TERM" == "dumb" ]]; then
     return
   fi
 

plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku redis service plugin"
-version = "1.4.8"
+version = "1.4.10"
 [plugin.config]

subcommands/upgrade

@@ -21,8 +21,6 @@ service-upgrade-cmd() {
   verify_service_name "$SERVICE"
 
   local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
-  local ID="$(cat "$SERVICE_ROOT/ID")"
-  is_container_status "$ID" "Running" || dokku_log_fail "Service ${SERVICE} container is not running"
 
   service_parse_args "${@:2}"
 
@@ -30,10 +28,17 @@ service-upgrade-cmd() {
     dokku_log_fail "Unable to proceed with upgrade, image ${PLUGIN_IMAGE}:${PLUGIN_IMAGE_VERSION} does not exist"
   fi
 
-  dokku_log_info2 "Upgrading $SERVICE to $PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION"
+  local NEW_PLUGIN_IMAGE_TAG="$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION"
+  if [[ "$(service_version "$SERVICE")" == "$NEW_PLUGIN_IMAGE_TAG" ]]; then
+    dokku_log_info1 "Service $SERVICE already running $NEW_PLUGIN_IMAGE_TAG"
+    return
+  fi
+
+  dokku_log_info2 "Upgrading $SERVICE to $NEW_PLUGIN_IMAGE_TAG"
   if [[ "$SERVICE_RESTART_APPS" == "true" ]]; then
     dokku_log_info2 "Stopping all linked services"
     for app in $(service_linked_apps "$SERVICE"); do
+      [[ "$app" == "-" ]] && continue
       ps_stop "$app"
     done
   fi
@@ -45,6 +50,7 @@ service-upgrade-cmd() {
   if [[ "$SERVICE_RESTART_APPS" == "true" ]]; then
     dokku_log_info2 "Starting all linked services"
     for app in $(service_linked_apps "$SERVICE"); do
+      [[ "$app" == "-" ]] && continue
       ps_start "$app"
     done
   fi

tests/service_unlink.bats

@@ -52,7 +52,7 @@ teardown() {
     check_value="Deploy options: --restart=on-failure:10"
   fi
 
-  options=$(dokku $report_action my_app | xargs)
+  options=$(dokku --quiet $report_action my_app | xargs)
   assert_equal "$options" "$check_value"
 }
 

tests/test_helper.bash

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-export DOKKU_QUIET_OUTPUT=1
 export DOKKU_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/dokku"
 export DOKKU_VERSION=${DOKKU_VERSION:-"master"}
 export PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/bin:$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/dokku:$PATH"