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

fix: drop extra check and always use the same network alias

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2023-02-08 18:30:12 -05:00
parent 7230fbfccd
commit c6f3b67509
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
functions
View File

@@ -110,10 +110,9 @@ service_create_container() {
[[ -f "$SERVICE_ROOT/IMAGE" ]] && PLUGIN_IMAGE="$(cat "$SERVICE_ROOT/IMAGE")" [[ -f "$SERVICE_ROOT/IMAGE" ]] && PLUGIN_IMAGE="$(cat "$SERVICE_ROOT/IMAGE")"
[[ -f "$SERVICE_ROOT/IMAGE_VERSION" ]] && PLUGIN_IMAGE_VERSION="$(cat "$SERVICE_ROOT/IMAGE_VERSION")" [[ -f "$SERVICE_ROOT/IMAGE_VERSION" ]] && PLUGIN_IMAGE_VERSION="$(cat "$SERVICE_ROOT/IMAGE_VERSION")"
local network_alias="$SERVICE_NAME" local network_alias="dokku-$PLUGIN_COMMAND_PREFIX-$(get_database_name "$SERVICE")"
local network="$(fn-plugin-property-get "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "initial-network")" local network="$(fn-plugin-property-get "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "initial-network")"
if [[ -n "$network" ]]; then if [[ -n "$network" ]]; then
network_alias="dokku-$PLUGIN_COMMAND_PREFIX-$(get_database_name "$SERVICE")"
DOCKER_ARGS+=("--network=${network}") DOCKER_ARGS+=("--network=${network}")
DOCKER_ARGS+=("--network-alias=${network_alias}") DOCKER_ARGS+=("--network-alias=${network_alias}")
LINK_CONTAINER_DOCKER_ARGS+=("--network=${network}") LINK_CONTAINER_DOCKER_ARGS+=("--network=${network}")
@@ -126,7 +125,7 @@ service_create_container() {
dokku_log_verbose_quiet "Connecting to networks after container create" dokku_log_verbose_quiet "Connecting to networks after container create"
while read -r line || [[ -n "$line" ]]; do while read -r line || [[ -n "$line" ]]; do
dokku_log_verbose_quiet "- $line" dokku_log_verbose_quiet "- $line"
"$DOCKER_BIN" network connect --alias "dokku-$PLUGIN_COMMAND_PREFIX-$(get_database_name "$SERVICE")" "$line" "$SERVICE_NAME" "$DOCKER_BIN" network connect --alias "$network_alias" "$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
suppress_output "$DOCKER_BIN" container start "$(cat "$SERVICE_ROOT/ID")" suppress_output "$DOCKER_BIN" container start "$(cat "$SERVICE_ROOT/ID")"
@@ -134,7 +133,7 @@ service_create_container() {
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
dokku_log_verbose_quiet "- $line" dokku_log_verbose_quiet "- $line"
"$DOCKER_BIN" network connect --alias "dokku-$PLUGIN_COMMAND_PREFIX-$(get_database_name "$SERVICE")" "$line" "$SERVICE_NAME" "$DOCKER_BIN" network connect --alias "$network_alias" "$line" "$SERVICE_NAME"
done < <(fn-plugin-property-get "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "post-start-network" | tr "," "\n") done < <(fn-plugin-property-get "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "post-start-network" | tr "," "\n")
fi fi

3
tests/link_networks.bats
View File

@@ -54,7 +54,6 @@ teardown() {
assert_success assert_success
assert_output_contains "alias:dokku.$PLUGIN_COMMAND_PREFIX.ls" assert_output_contains "alias:dokku.$PLUGIN_COMMAND_PREFIX.ls"
assert_output_contains "alias:dokku-$PLUGIN_COMMAND_PREFIX-ls" assert_output_contains "alias:dokku-$PLUGIN_COMMAND_PREFIX-ls"
assert_output_contains "alias:ls"
run dokku "$PLUGIN_COMMAND_PREFIX:set" ls initial-network run dokku "$PLUGIN_COMMAND_PREFIX:set" ls initial-network
echo "output: $output" echo "output: $output"
@@ -127,7 +126,6 @@ teardown() {
assert_success assert_success
assert_output_contains "alias:dokku.$PLUGIN_COMMAND_PREFIX.ls" assert_output_contains "alias:dokku.$PLUGIN_COMMAND_PREFIX.ls"
assert_output_contains "alias:dokku-$PLUGIN_COMMAND_PREFIX-ls" assert_output_contains "alias:dokku-$PLUGIN_COMMAND_PREFIX-ls"
assert_output_contains "alias:ls"
run dokku "$PLUGIN_COMMAND_PREFIX:set" ls post-create-network run dokku "$PLUGIN_COMMAND_PREFIX:set" ls post-create-network
echo "output: $output" echo "output: $output"
@@ -200,7 +198,6 @@ teardown() {
assert_success assert_success
assert_output_contains "alias:dokku.$PLUGIN_COMMAND_PREFIX.ls" assert_output_contains "alias:dokku.$PLUGIN_COMMAND_PREFIX.ls"
assert_output_contains "alias:dokku-$PLUGIN_COMMAND_PREFIX-ls" assert_output_contains "alias:dokku-$PLUGIN_COMMAND_PREFIX-ls"
assert_output_contains "alias:ls"
run dokku "$PLUGIN_COMMAND_PREFIX:set" ls post-start-network run dokku "$PLUGIN_COMMAND_PREFIX:set" ls post-start-network
echo "output: $output" echo "output: $output"