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

refactor: use the same network alias as is used when running :link command

Browse Source 
This allows for some degree of parity as the network will now resolve the same for both linked and networked containers.
This commit is contained in:
Jose Diaz-Gonzalez
2023-02-08 17:08:08 -05:00
parent fb86f97d4b
commit 75ce3385fa
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
functions
View File

@@ -119,7 +119,7 @@ service_create_container() {
local network_alias="$SERVICE_NAME" local network_alias="$SERVICE_NAME"
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="$(get_database_name "$SERVICE").$PLUGIN_COMMAND_PREFIX" 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}")
@@ -132,7 +132,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 "$(get_database_name "$SERVICE").$PLUGIN_COMMAND_PREFIX" "$line" "$SERVICE_NAME" "$DOCKER_BIN" network connect --alias "dokku-$PLUGIN_COMMAND_PREFIX-$(get_database_name "$SERVICE")" "$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")"
@@ -140,7 +140,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 "$(get_database_name "$SERVICE").$PLUGIN_COMMAND_PREFIX" "$line" "$SERVICE_NAME" "$DOCKER_BIN" network connect --alias "dokku-$PLUGIN_COMMAND_PREFIX-$(get_database_name "$SERVICE")" "$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

14
tests/link_networks.bats
View File

@@ -53,7 +53,7 @@ teardown() {
echo "status: $status" echo "status: $status"
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:ls.$PLUGIN_COMMAND_PREFIX" assert_output_contains "alias:dokku-$PLUGIN_COMMAND_PREFIX-ls"
assert_output_contains "alias:ls" assert_output_contains "alias:ls"
run dokku "$PLUGIN_COMMAND_PREFIX:set" ls initial-network run dokku "$PLUGIN_COMMAND_PREFIX:set" ls initial-network
@@ -121,6 +121,14 @@ teardown() {
assert_output_contains custom-network assert_output_contains custom-network
assert_output_contains bridge assert_output_contains bridge
run docker inspect dokku.$PLUGIN_COMMAND_PREFIX.ls -f '{{range $net,$v := .NetworkSettings.Networks}}{{range $k,$alias := $v.Aliases}}{{printf "alias:%s\n" $alias}}{{end}}{{end}}'
echo "output: $output"
echo "status: $status"
assert_success
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"
echo "status: $status" echo "status: $status"
@@ -191,7 +199,7 @@ teardown() {
echo "status: $status" echo "status: $status"
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:ls.$PLUGIN_COMMAND_PREFIX" assert_output_contains "alias:dokku-$PLUGIN_COMMAND_PREFIX-ls"
assert_output_contains "alias: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
@@ -258,7 +266,7 @@ teardown() {
echo "status: $status" echo "status: $status"
assert_success assert_success
assert_output_contains "alias:dokku.$PLUGIN_COMMAND_PREFIX.lsa" assert_output_contains "alias:dokku.$PLUGIN_COMMAND_PREFIX.lsa"
assert_output_contains "alias:lsa.$PLUGIN_COMMAND_PREFIX" assert_output_contains "alias:dokku-$PLUGIN_COMMAND_PREFIX-lsa"
run dokku "$PLUGIN_COMMAND_PREFIX:destroy" lsa --force run dokku "$PLUGIN_COMMAND_PREFIX:destroy" lsa --force
echo "output: $output" echo "output: $output"