dokku/dokku-redis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not always allocate a tty on connect

Browse Source
This commit is contained in:
Loïc Guitaut
2015-09-21 10:33:58 +02:00
parent 3167918848
commit 7ea002b2a6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
commands
View File

@@ -164,9 +164,9 @@ case "$1" in
verify_service_name "$2" verify_service_name "$2"
SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
SERVICE_NAME=$(get_service_name "$SERVICE") SERVICE_NAME=$(get_service_name "$SERVICE")
has_tty && SERVICE_TTY_OPTS="-t"
# shellcheck disable=SC2016 docker exec -i $SERVICE_TTY_OPTS "$SERVICE_NAME" redis-cli
docker run -it --link "$SERVICE_NAME:redis" --rm "$PLUGIN_IMAGE" sh -c 'exec redis-cli -h "$REDIS_PORT_6379_TCP_ADDR" -p "$REDIS_PORT_6379_TCP_PORT"'
;; ;;
$PLUGIN_COMMAND_PREFIX:info) $PLUGIN_COMMAND_PREFIX:info)

2
tests/redis_connect.bats
View File

@@ -24,6 +24,6 @@ teardown() {
@test "($PLUGIN_COMMAND_PREFIX:connect) success" { @test "($PLUGIN_COMMAND_PREFIX:connect) success" {
export ECHO_DOCKER_COMMAND="true" export ECHO_DOCKER_COMMAND="true"
run dokku "$PLUGIN_COMMAND_PREFIX:connect" l run dokku "$PLUGIN_COMMAND_PREFIX:connect" l
assert_output 'docker run -it --link dokku.redis.l:redis --rm redis sh -c exec redis-cli -h "$REDIS_PORT_6379_TCP_ADDR" -p "$REDIS_PORT_6379_TCP_PORT"' assert_output 'docker exec -i -t dokku.redis.l redis-cli'
} }