Merge pull request #3 from Flink/lg-various-updates

Various updates
This commit is contained in:
Jose Diaz-Gonzalez
2015-09-09 13:33:39 -04:00
2 changed files with 2 additions and 3 deletions

View File

@@ -35,7 +35,7 @@ case "$1" in
echo "$ID" > "$SERVICE_ROOT/ID"
dokku_log_verbose_quiet "Waiting for container to be ready"
sleep 10
docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" aanand/wait > /dev/null
dokku_log_info2 "$PLUGIN_SERVICE container created: $SERVICE"
dokku "$PLUGIN_COMMAND_PREFIX:info" "$SERVICE"
@@ -67,8 +67,6 @@ case "$1" in
ID=$(cat "$SERVICE_ROOT/ID")
service_stop "$SERVICE"
dokku_log_verbose_quiet "Killing container"
docker kill "$ID" > /dev/null || true
sleep 1
dokku_log_verbose_quiet "Removing container"

View File

@@ -7,6 +7,7 @@ if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q "$PLUGIN_IMAGE_VERSION"
fi
docker pull svendowideit/ambassador:latest
docker pull aanand/wait:latest
mkdir -p "$PLUGIN_DATA_ROOT" || echo "Failed to create $PLUGIN_SERVICE directory"
chown dokku:dokku "$PLUGIN_DATA_ROOT"