Merge pull request #23 from dokku/lg-fix-wait-image
Use our own image to wait for services
This commit is contained in:
2
commands
2
commands
@@ -43,7 +43,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"
|
||||||
|
|||||||
4
install
4
install
@@ -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"
|
||||||
|
|||||||
Reference in New Issue
Block a user