Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
efa82f6347 | ||
|
|
263d56a606 | ||
|
|
655901b1e0 | ||
|
|
71743fcad4 | ||
|
|
560ec0bb52 | ||
|
|
894b17ec2a | ||
|
|
a357a81180 | ||
|
|
0dcc65963b |
@@ -1,6 +1,6 @@
|
||||
# dokku redis [](https://travis-ci.org/dokku/dokku-redis) [](https://webchat.freenode.net/?channels=dokku)
|
||||
|
||||
Official redis plugin for dokku. Currently defaults to installing [redis 4.0.8](https://hub.docker.com/_/redis/).
|
||||
Official redis plugin for dokku. Currently defaults to installing [redis 4.0.11](https://hub.docker.com/_/redis/).
|
||||
|
||||
## requirements
|
||||
|
||||
|
||||
2
config
2
config
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
export REDIS_IMAGE=${REDIS_IMAGE:="redis"}
|
||||
export REDIS_IMAGE_VERSION=${REDIS_IMAGE_VERSION:="4.0.8"}
|
||||
export REDIS_IMAGE_VERSION=${REDIS_IMAGE_VERSION:="4.0.11"}
|
||||
export REDIS_ROOT=${REDIS_ROOT:="/var/lib/dokku/services/redis"}
|
||||
export REDIS_HOST_ROOT=${REDIS_HOST_ROOT:=$REDIS_ROOT}
|
||||
|
||||
|
||||
@@ -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)
|
||||
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)
|
||||
echo "$ID" > "$SERVICE_ROOT/ID"
|
||||
|
||||
dokku_log_verbose_quiet "Waiting for container to be ready"
|
||||
|
||||
@@ -76,7 +76,7 @@ fn-help-contents() {
|
||||
fn-help-contents-subcommand() {
|
||||
declare SUBCOMMAND="$1" FULL_OUTPUT="$2"
|
||||
local TMPDIR=$(mktemp -d)
|
||||
local UNCLEAN_FILE="${TMPDIR}cmd-unclean" CLEAN_FILE="${TMPDIR}cmd-clean"
|
||||
local UNCLEAN_FILE="${TMPDIR}/cmd-unclean" CLEAN_FILE="${TMPDIR}/cmd-clean"
|
||||
local BOLD CMD_OUTPUT CYAN EXAMPLE LIGHT_GRAY NORMAL
|
||||
trap 'rm -rf "$TMPDIR" > /dev/null' RETURN INT TERM EXIT
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[plugin]
|
||||
description = "dokku redis service plugin"
|
||||
version = "1.4.3"
|
||||
version = "1.4.6"
|
||||
[plugin.config]
|
||||
|
||||
@@ -15,7 +15,7 @@ service-upgrade-cmd() {
|
||||
#F -R|--restart-apps "true", whether to force an app restart
|
||||
declare desc="upgrade service <service> to the specified versions"
|
||||
local cmd="$PLUGIN_COMMAND_PREFIX:upgrade" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
|
||||
declare SERVICE="$1" UPGRADE_FLAG_LIST="${@:2}"
|
||||
declare SERVICE="$1" UPGRADE_FLAGS_LIST="${@:2}"
|
||||
|
||||
[[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
|
||||
verify_service_name "$SERVICE"
|
||||
|
||||
@@ -24,7 +24,7 @@ case "$1" in
|
||||
echo "nats 0.9.4 9216d5a4eec8 2 days ago 109.3 MB"
|
||||
echo "postgres 9.5.4 6412eb70175e 2 days ago 265.7 MB"
|
||||
echo "rabbitmq 3.6.5-management 327b803301e9 2 days ago 143.5 MB"
|
||||
echo "redis 4.0.8 9216d5a4eec8 2 days ago 109.3 MB"
|
||||
echo "redis 4.0.11 9216d5a4eec8 2 days ago 109.3 MB"
|
||||
echo "rethinkdb 2.3.4 f27010a550ec 2 days ago 196.3 MB"
|
||||
echo "svendowideit/ambassador latest 0d2200edc53e 2 days ago 7.241 MB"
|
||||
;;
|
||||
@@ -73,7 +73,7 @@ case "$1" in
|
||||
echo '9f10b6dc12d5 nats:0.9.4 "/entrypoint.sh redi" 11 seconds ago Up 10 seconds 4222/tcp dokku.nats.l'
|
||||
echo '7f899b723c08 postgres:9.5.4 "/docker-entrypoint." 11 seconds ago Up 10 seconds 5432/tcp dokku.postgres.l'
|
||||
echo '5e50a462661e rabbitmq:3.6.5-management "/docker-entrypoint." 11 seconds ago Up 10 seconds 5672/tcp, 15672/tcp dokku.rabbitmq.l'
|
||||
echo 'c39ca00fa3c6 redis:4.0.8 "/entrypoint.sh redi" 11 seconds ago Up 10 seconds 6379/tcp dokku.redis.l'
|
||||
echo 'c39ca00fa3c6 redis:4.0.11 "/entrypoint.sh redi" 11 seconds ago Up 10 seconds 6379/tcp dokku.redis.l'
|
||||
echo 'dc98c2939a80 rethinkdb:2.3.4 "rethinkdb --bind al" 11 seconds ago Up 10 seconds 8080/tcp, 28015/tcp, 29015/tcp dokku.rethinkdb.l'
|
||||
fi
|
||||
;;
|
||||
|
||||
@@ -32,5 +32,5 @@ teardown() {
|
||||
export ECHO_DOCKER_COMMAND="true"
|
||||
run dokku "$PLUGIN_COMMAND_PREFIX:import" l < "$PLUGIN_DATA_ROOT/fake.rdb"
|
||||
password="$(cat "$PLUGIN_DATA_ROOT/l/PASSWORD")"
|
||||
assert_output "docker run --rm -i -v $PLUGIN_DATA_ROOT/l/data:/data redis:4.0.8 bash -c cat > /data/dump.rdb && chown redis: /data/dump.rdb"
|
||||
assert_output "docker run --rm -i -v $PLUGIN_DATA_ROOT/l/data:/data redis:4.0.11 bash -c cat > /data/dump.rdb && chown redis: /data/dump.rdb"
|
||||
}
|
||||
|
||||
@@ -11,20 +11,20 @@ teardown() {
|
||||
|
||||
@test "($PLUGIN_COMMAND_PREFIX:list) with no exposed ports, no linked apps" {
|
||||
run dokku "$PLUGIN_COMMAND_PREFIX:list"
|
||||
assert_contains "${lines[*]}" "l redis:4.0.8 running - -"
|
||||
assert_contains "${lines[*]}" "l redis:4.0.11 running - -"
|
||||
}
|
||||
|
||||
@test "($PLUGIN_COMMAND_PREFIX:list) with exposed ports" {
|
||||
dokku "$PLUGIN_COMMAND_PREFIX:expose" l 4242
|
||||
run dokku "$PLUGIN_COMMAND_PREFIX:list"
|
||||
assert_contains "${lines[*]}" "l redis:4.0.8 running 6379->4242 -"
|
||||
assert_contains "${lines[*]}" "l redis:4.0.11 running 6379->4242 -"
|
||||
}
|
||||
|
||||
@test "($PLUGIN_COMMAND_PREFIX:list) with linked app" {
|
||||
dokku apps:create my_app
|
||||
dokku "$PLUGIN_COMMAND_PREFIX:link" l my_app
|
||||
run dokku "$PLUGIN_COMMAND_PREFIX:list"
|
||||
assert_contains "${lines[*]}" "l redis:4.0.8 running - my_app"
|
||||
assert_contains "${lines[*]}" "l redis:4.0.11 running - my_app"
|
||||
dokku --force apps:destroy my_app
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user