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

Merge pull request #4 from dokku/lg-use-cli-from-docker

Browse Source 
Remove dependencies & warning
This commit is contained in:
Jose Diaz-Gonzalez
2015-09-08 09:56:19 -04:00
parent 803b66e8ae 9c64894ba6
commit 491f144086
3 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
commands
View File

@@ -8,10 +8,6 @@ if [[ ! -d $PLUGIN_DATA_ROOT ]]; then
dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugins-install" dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugins-install"
fi fi
if ! command -v redis-cli &>/dev/null; then
dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugins-install-dependencies"
fi
case "$1" in case "$1" in
$PLUGIN_COMMAND_PREFIX:alias) $PLUGIN_COMMAND_PREFIX:alias)
[[ -z $2 ]] && dokku_log_fail "Please specify a name for the service" [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
@@ -155,10 +151,10 @@ case "$1" in
[[ -z $2 ]] && dokku_log_fail "Please specify a name for the service" [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
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")
ID=$(cat "$SERVICE_ROOT/ID") # shellcheck disable=SC2016
IP=$(get_container_ip "$ID") 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"'
redis-cli -h "$IP" -p 6379
;; ;;
$PLUGIN_COMMAND_PREFIX:info) $PLUGIN_COMMAND_PREFIX:info)

15
dependencies
View File

@@ -1,15 +0,0 @@
#!/usr/bin/env bash
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$(dirname "$0")/config"
case "$DOKKU_DISTRO" in
ubuntu)
export DEBIAN_FRONTEND=noninteractive
apt-get update
apt-get install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes -qq -y redis-tools
;;
opensuse)
zypper -q in -y redis-tools
;;
esac

8
functions
View File

@@ -127,7 +127,7 @@ service_status() {
} }
service_port_expose() { service_port_expose() {
service_start "$1" service_start "$1" "true"
service_port_unpause "$1" "true" "${@:2}" service_port_unpause "$1" "true" "${@:2}"
} }
@@ -196,10 +196,14 @@ docker_ports_options() {
service_start() { service_start() {
local SERVICE="$1" local SERVICE="$1"
local QUIET="$2"
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
local SERVICE_NAME=$(get_service_name "$SERVICE") local SERVICE_NAME=$(get_service_name "$SERVICE")
local ID=$(docker ps -f status=running | grep "$SERVICE_NAME" | awk '{print $1}') || true local ID=$(docker ps -f status=running | grep "$SERVICE_NAME" | awk '{print $1}') || true
[[ -n $ID ]] && dokku_log_warn "Service is already started" && return 0 if [[ -n $ID ]]; then
[[ -z $QUIET ]] && dokku_log_warn "Service is already started"
return 0
fi
dokku_log_info1_quiet "Starting container" dokku_log_info1_quiet "Starting container"
local PREVIOUS_ID=$(docker ps -f status=exited | grep "$SERVICE_NAME" | awk '{print $1}') || true local PREVIOUS_ID=$(docker ps -f status=exited | grep "$SERVICE_NAME" | awk '{print $1}') || true