From 9776ebdf6a50a736bdef3374c2c746f2e66791ba Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 28 May 2023 01:00:06 -0400 Subject: [PATCH] Release 1.34.0 --- README.md | 2 +- common-functions | 4 ++-- functions | 4 ++-- plugin.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 701a17b..ceb87c8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # dokku redis [![Build Status](https://img.shields.io/github/actions/workflow/status/dokku/dokku-redis/ci.yml?branch=master&style=flat-square "Build Status")](https://github.com/dokku/dokku-redis/actions/workflows/ci.yml?query=branch%3Amaster) [![IRC Network](https://img.shields.io/badge/irc-libera-blue.svg?style=flat-square "IRC Libera")](https://webchat.libera.chat/?channels=dokku) -Official redis plugin for dokku. Currently defaults to installing [redis 7.0.10](https://hub.docker.com/_/redis/). +Official redis plugin for dokku. Currently defaults to installing [redis 7.0.11](https://hub.docker.com/_/redis/). ## Requirements 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 5f0a735..3d892d8 100755 --- a/functions +++ b/functions @@ -194,7 +194,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 @@ -205,7 +205,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 if [[ -n $PREVIOUS_ID ]]; then "$DOCKER_BIN" container start "$PREVIOUS_ID" >/dev/null diff --git a/plugin.toml b/plugin.toml index 45977d9..eac8de6 100644 --- a/plugin.toml +++ b/plugin.toml @@ -1,4 +1,4 @@ [plugin] description = "dokku redis service plugin" -version = "1.32.4" +version = "1.34.0" [plugin.config]