Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bd5ae9442d | ||
|
|
cd18e9f4a3 | ||
|
|
c2aff1a5a3 | ||
|
|
48277db27f | ||
|
|
f9bac907df | ||
|
|
258eb2fea8 |
@@ -1 +1 @@
|
|||||||
FROM redis:6.2.5
|
FROM redis:6.2.6
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# dokku redis [](https://github.com/dokku/dokku-redis/actions/workflows/ci.yml?query=branch%3Amaster) [](https://webchat.libera.chat/?channels=dokku)
|
# dokku redis [](https://github.com/dokku/dokku-redis/actions/workflows/ci.yml?query=branch%3Amaster) [](https://webchat.libera.chat/?channels=dokku)
|
||||||
|
|
||||||
Official redis plugin for dokku. Currently defaults to installing [redis 6.2.5](https://hub.docker.com/_/redis/).
|
Official redis plugin for dokku. Currently defaults to installing [redis 6.2.6](https://hub.docker.com/_/redis/).
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
|
|||||||
@@ -463,7 +463,7 @@ service_info() {
|
|||||||
"--version: $(service_version "$SERVICE")"
|
"--version: $(service_version "$SERVICE")"
|
||||||
)
|
)
|
||||||
if [[ -z "$INFO_FLAG" ]]; then
|
if [[ -z "$INFO_FLAG" ]]; then
|
||||||
dokku_log_info2 "$SERVICE $PLUGIN_COMMAND_PREFIX service information"
|
dokku_log_info2_quiet "$SERVICE $PLUGIN_COMMAND_PREFIX service information"
|
||||||
for flag in "${flag_map[@]}"; do
|
for flag in "${flag_map[@]}"; do
|
||||||
key="$(echo "${flag#--}" | cut -f1 -d' ' | tr - ' ')"
|
key="$(echo "${flag#--}" | cut -f1 -d' ' | tr - ' ')"
|
||||||
dokku_log_verbose "$(printf "%-20s %-25s" "${key^}" "${flag#*: }")"
|
dokku_log_verbose "$(printf "%-20s %-25s" "${key^}" "${flag#*: }")"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[plugin]
|
[plugin]
|
||||||
description = "dokku redis service plugin"
|
description = "dokku redis service plugin"
|
||||||
version = "1.16.1"
|
version = "1.17.0"
|
||||||
[plugin.config]
|
[plugin.config]
|
||||||
|
|||||||
36
pre-restore
Executable file
36
pre-restore
Executable file
@@ -0,0 +1,36 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config"
|
||||||
|
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common-functions"
|
||||||
|
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/functions"
|
||||||
|
set -eo pipefail
|
||||||
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
|
plugin-pre-restore() {
|
||||||
|
declare SCHEDULER="$1" APP="$2"
|
||||||
|
|
||||||
|
if [[ "$SCHEDULER" != "docker-local" ]]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
local SERVICES=$(ls "$PLUGIN_DATA_ROOT" 2>/dev/null)
|
||||||
|
for SERVICE in $SERVICES; do
|
||||||
|
if ! in_links_file "$SERVICE" "$APP"; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
local status="$(service_status "$SERVICE")"
|
||||||
|
if [[ "$status" == "running" ]]; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$status" == "restarting" ]]; then
|
||||||
|
dokku_log_warn "$PLUGIN_SERVICE service $SERVICE is restarting and may cause issues with linked app $APP"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
dokku_log_warn "$PLUGIN_SERVICE service $SERVICE is not running, issuing service start"
|
||||||
|
service_start "$SERVICE"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
plugin-pre-restore "$@"
|
||||||
32
pre-start
Executable file
32
pre-start
Executable file
@@ -0,0 +1,32 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config"
|
||||||
|
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/common-functions"
|
||||||
|
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/functions"
|
||||||
|
set -eo pipefail
|
||||||
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
|
plugin-pre-start() {
|
||||||
|
declare APP="$1"
|
||||||
|
|
||||||
|
local SERVICES=$(ls "$PLUGIN_DATA_ROOT" 2>/dev/null)
|
||||||
|
for SERVICE in $SERVICES; do
|
||||||
|
if ! in_links_file "$SERVICE" "$APP"; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
local status="$(service_status "$SERVICE")"
|
||||||
|
if [[ "$status" == "running" ]]; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$status" == "restarting" ]]; then
|
||||||
|
dokku_log_warn "$PLUGIN_SERVICE service $SERVICE is restarting and may cause issues with linked app $APP"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
dokku_log_warn "$PLUGIN_SERVICE service $SERVICE is not running, issuing service start"
|
||||||
|
service_start "$SERVICE"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
plugin-pre-start "$@"
|
||||||
Reference in New Issue
Block a user