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

refactor: directly write out the cid file when creating the service container

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2023-02-07 15:54:39 -05:00
parent c5d2a6804c
commit 3f40d5476d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
functions
View File

@@ -85,9 +85,10 @@ service_create_container() {
export CONFIG_OPTIONS="$(cat "$SERVICE_ROOT/CONFIG_OPTIONS")" export CONFIG_OPTIONS="$(cat "$SERVICE_ROOT/CONFIG_OPTIONS")"
fi fi
rm -f "$SERVICE_ROOT/ID"
declare -a DOCKER_ARGS declare -a DOCKER_ARGS
DOCKER_ARGS=() DOCKER_ARGS=()
DOCKER_ARGS+=("--detach") DOCKER_ARGS+=("--cidfile=$SERVICE_ROOT/ID")
DOCKER_ARGS+=("--env-file=$SERVICE_ROOT/ENV") DOCKER_ARGS+=("--env-file=$SERVICE_ROOT/ENV")
DOCKER_ARGS+=("--env=MYSQL_DATABASE=$DATABASE_NAME") DOCKER_ARGS+=("--env=MYSQL_DATABASE=$DATABASE_NAME")
DOCKER_ARGS+=("--env=MYSQL_PASSWORD=$PASSWORD") DOCKER_ARGS+=("--env=MYSQL_PASSWORD=$PASSWORD")
@@ -128,8 +129,8 @@ service_create_container() {
fi fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
ID=$("$DOCKER_BIN" container run "${DOCKER_ARGS[@]}" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" $CONFIG_OPTIONS) "$DOCKER_BIN" container create "${DOCKER_ARGS[@]}" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" $CONFIG_OPTIONS >/dev/null
echo "$ID" >"$SERVICE_ROOT/ID" "$DOCKER_BIN" container start "$(cat "$SERVICE_ROOT/ID")" >/dev/null
dokku_log_verbose_quiet "Waiting for container to be ready" 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 "$DOCKER_BIN" container run "${LINK_CONTAINER_DOCKER_ARGS[@]}" "$PLUGIN_WAIT_IMAGE" -c "$SERVICE_NAME:$PLUGIN_DATASTORE_WAIT_PORT" >/dev/null