From ddaefb351a339edd799c1791a39b4ac036fe3f58 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 28 May 2023 01:00:05 -0400 Subject: [PATCH] Release 1.34.0 --- common-functions | 4 ++-- functions | 4 ++-- plugin.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common-functions b/common-functions index 168a48d..c0ba352 100755 --- a/common-functions +++ b/common-functions @@ -457,7 +457,7 @@ service_container_rm() { local ID service_pause "$SERVICE" - ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "name=^/$SERVICE_NAME$" --format '{{ .ID }}') || true + ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "name=^/$SERVICE_NAME$") || true # this may be 'true' in tests... if [[ -z "$ID" ]] || [[ "$ID" == "true" ]]; then return 0 @@ -939,7 +939,7 @@ service_pause() { declare SERVICE="$1" local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" local SERVICE_NAME="$(get_service_name "$SERVICE")" - local ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "name=^/$SERVICE_NAME$" --format '{{ .ID }}') || true + local ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "name=^/$SERVICE_NAME$") || true [[ -z $ID ]] && dokku_log_warn "Service is already paused" && return 0 if [[ -n $ID ]]; then diff --git a/functions b/functions index 5ed73b1..fdc064a 100755 --- a/functions +++ b/functions @@ -174,7 +174,7 @@ service_start() { local QUIET="$2" local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" local SERVICE_NAME="$(get_service_name "$SERVICE")" - local ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "status=running" --filter "name=^/$SERVICE_NAME$" --format '{{ .ID }}') || true + local ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "status=running" --filter "name=^/$SERVICE_NAME$") || true if [[ -n $ID ]]; then [[ -z $QUIET ]] && dokku_log_warn "Service is already started" if [[ ! -f "$SERVICE_ROOT/ID" ]] || [[ "$(cat "$SERVICE_ROOT/ID")" != "$ID" ]]; then @@ -185,7 +185,7 @@ service_start() { fi dokku_log_info2_quiet "Starting container" - local PREVIOUS_ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "status=exited" --filter "name=^/$SERVICE_NAME$" --format '{{ .ID }}') || true + local PREVIOUS_ID=$("$DOCKER_BIN" container ps -aq --no-trunc --filter "status=exited" --filter "name=^/$SERVICE_NAME$") || true local PASSWORD="$(service_password "$SERVICE")" if [[ -n $PREVIOUS_ID ]]; then diff --git a/plugin.toml b/plugin.toml index 6978468..ee98409 100644 --- a/plugin.toml +++ b/plugin.toml @@ -1,4 +1,4 @@ [plugin] description = "dokku rabbitmq service plugin" -version = "1.32.4" +version = "1.34.0" [plugin.config]