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

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 f68b22116d
commit 5479a2b0c9
2 changed files with 14 additions and 6 deletions

View File

@@ -53,7 +53,7 @@ teardown() {
echo "status: $status"
assert_success
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"
run dokku "$PLUGIN_COMMAND_PREFIX:set" ls initial-network
@@ -121,6 +121,14 @@ teardown() {
assert_output_contains custom-network
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
echo "output: $output"
echo "status: $status"
@@ -191,7 +199,7 @@ teardown() {
echo "status: $status"
assert_success
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"
run dokku "$PLUGIN_COMMAND_PREFIX:set" ls post-start-network
@@ -258,7 +266,7 @@ teardown() {
echo "status: $status"
assert_success
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
echo "output: $output"