Use our own image to wait for services

This commit is contained in:
Loïc Guitaut
2015-09-24 11:07:05 +02:00
parent d3e3a702fc
commit 7c867da3dc
2 changed files with 4 additions and 4 deletions

View File

@@ -46,7 +46,7 @@ case "$1" in
echo "$ID" > "$SERVICE_ROOT/ID" echo "$ID" > "$SERVICE_ROOT/ID"
dokku_log_verbose_quiet "Waiting for container to be ready" dokku_log_verbose_quiet "Waiting for container to be ready"
docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" aanand/wait > /dev/null docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" dokkupaas/wait > /dev/null
dokku_log_info2 "$PLUGIN_SERVICE container created: $SERVICE" dokku_log_info2 "$PLUGIN_SERVICE container created: $SERVICE"
dokku "$PLUGIN_COMMAND_PREFIX:info" "$SERVICE" dokku "$PLUGIN_COMMAND_PREFIX:info" "$SERVICE"
@@ -80,7 +80,7 @@ case "$1" in
dokku_log_verbose_quiet "Deleting container data" dokku_log_verbose_quiet "Deleting container data"
service_start "$SERVICE" service_start "$SERVICE"
docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" aanand/wait > /dev/null docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" dokkupaas/wait > /dev/null
docker exec -it "$ID" chmod -R 777 /var/lib/mysql docker exec -it "$ID" chmod -R 777 /var/lib/mysql
service_stop "$SERVICE" service_stop "$SERVICE"

View File

@@ -10,8 +10,8 @@ if ! docker images | grep -e "^svendowideit/ambassador "; then
docker pull svendowideit/ambassador:latest docker pull svendowideit/ambassador:latest
fi fi
if ! docker images | grep -e "^aanand/wait "; then if ! docker images | grep -e "^dokkupaas/wait "; then
docker pull aanand/wait:latest docker pull dokkupaas/wait:latest
fi fi
mkdir -p "$PLUGIN_DATA_ROOT" || echo "Failed to create $PLUGIN_SERVICE directory" mkdir -p "$PLUGIN_DATA_ROOT" || echo "Failed to create $PLUGIN_SERVICE directory"