From ddfbbd669496ea2a745cc3acf2ff72f8eb5be54b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 7 Feb 2023 15:54:39 -0500 Subject: [PATCH] refactor: directly write out the cid file when creating the service container --- functions | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/functions b/functions index ab8a042..121bff9 100755 --- a/functions +++ b/functions @@ -78,9 +78,10 @@ service_create_container() { export CONFIG_OPTIONS="$(cat "$SERVICE_ROOT/CONFIG_OPTIONS")" fi + rm -f "$SERVICE_ROOT/ID" declare -a DOCKER_ARGS DOCKER_ARGS=() - DOCKER_ARGS+=("--detach") + DOCKER_ARGS+=("--cidfile=$SERVICE_ROOT/ID") DOCKER_ARGS+=("--env-file=$SERVICE_ROOT/ENV") DOCKER_ARGS+=("--hostname=$SERVICE") DOCKER_ARGS+=("--label=dokku.service=$PLUGIN_COMMAND_PREFIX") @@ -117,8 +118,8 @@ service_create_container() { fi # shellcheck disable=SC2086 - ID=$("$DOCKER_BIN" container run "${DOCKER_ARGS[@]}" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" redis-server /usr/local/etc/redis/redis.conf --bind 0.0.0.0 $CONFIG_OPTIONS) - echo "$ID" >"$SERVICE_ROOT/ID" + "$DOCKER_BIN" container create "${DOCKER_ARGS[@]}" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" redis-server /usr/local/etc/redis/redis.conf --bind 0.0.0.0 $CONFIG_OPTIONS >/dev/null + "$DOCKER_BIN" container start "$(cat "$SERVICE_ROOT/ID")" >/dev/null dokku_log_verbose_quiet "Waiting for container to be ready" "$DOCKER_BIN" container run "${LINK_CONTAINER_DOCKER_ARGS[@]}" "$PLUGIN_WAIT_IMAGE" -c "$SERVICE_NAME:$PLUGIN_DATASTORE_WAIT_PORT" >/dev/null