This commit is contained in:
Jose Diaz-Gonzalez
2023-02-07 21:46:24 -05:00
parent 76a5fbd9cb
commit cdb062fed1
2 changed files with 5 additions and 7 deletions

View File

@@ -120,7 +120,7 @@ service_create_container() {
fi fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
"$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 suppress_output "$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
if [[ -n "$(fn-plugin-property-get "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "post-create-network")" ]]; then if [[ -n "$(fn-plugin-property-get "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "post-create-network")" ]]; then
dokku_log_verbose_quiet "Connecting to networks after container create" dokku_log_verbose_quiet "Connecting to networks after container create"
@@ -129,7 +129,7 @@ service_create_container() {
"$DOCKER_BIN" network connect --alias "$SERVICE_NAME" "$line" "$SERVICE_NAME" "$DOCKER_BIN" network connect --alias "$SERVICE_NAME" "$line" "$SERVICE_NAME"
done < <(fn-plugin-property-get "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "post-create-network" | tr "," "\n") done < <(fn-plugin-property-get "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "post-create-network" | tr "," "\n")
fi fi
"$DOCKER_BIN" container start "$(cat "$SERVICE_ROOT/ID")" suppress_output "$DOCKER_BIN" container start "$(cat "$SERVICE_ROOT/ID")"
if [[ -n "$(fn-plugin-property-get "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "post-start-network")" ]]; then if [[ -n "$(fn-plugin-property-get "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "post-start-network")" ]]; then
dokku_log_verbose_quiet "Connecting to networks after container start" dokku_log_verbose_quiet "Connecting to networks after container start"
while read -r line || [[ -n "$line" ]]; do while read -r line || [[ -n "$line" ]]; do
@@ -178,9 +178,9 @@ service_import() {
if [[ -t 0 ]]; then if [[ -t 0 ]]; then
dokku_log_fail "No data provided on stdin." dokku_log_fail "No data provided on stdin."
fi fi
service_container_rm "$SERVICE" suppress_output service_container_rm "$SERVICE"
"$DOCKER_BIN" container run --rm -i -v "$SERVICE_HOST_ROOT/data:/data" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" bash -c "cat > /data/dump.rdb && chown redis: /data/dump.rdb" "$DOCKER_BIN" container run --rm -i -v "$SERVICE_HOST_ROOT/data:/data" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" bash -c "cat > /data/dump.rdb && chown redis: /data/dump.rdb"
service_start "$SERVICE" suppress_output service_start "$SERVICE"
} }
service_start() { service_start() {

View File

@@ -7,7 +7,6 @@ setup() {
} }
teardown() { teardown() {
dokku trace:off
dokku --force "$PLUGIN_COMMAND_PREFIX:destroy" l dokku --force "$PLUGIN_COMMAND_PREFIX:destroy" l
rm -f "/tmp/fake.rdb" rm -f "/tmp/fake.rdb"
} }
@@ -34,8 +33,7 @@ teardown() {
} }
@test "($PLUGIN_COMMAND_PREFIX:import) success" { @test "($PLUGIN_COMMAND_PREFIX:import) success" {
dokku trace:on run dokku --trace "$PLUGIN_COMMAND_PREFIX:import" l <"/tmp/fake.rdb"
run dokku "$PLUGIN_COMMAND_PREFIX:import" l <"/tmp/fake.rdb"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success assert_success