fix: ensure we raise errors when setting ports
This commit is contained in:
1 parent
ba3ad4a9ab
commit
a2209eeee7
2 files changed
+7
-3
No files matched your search
@@ -353,7 +353,7 @@ func parsePortMapString(stringPortMap string) ([]PortMap, error) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
return uniquePortMaps(portMaps), nil
|
return portMaps, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// removePortMaps removes specific port mappings from an app
|
// removePortMaps removes specific port mappings from an app
|
||||||
@@ -406,8 +406,12 @@ func reusesSchemeHostPort(portMaps []PortMap) error {
|
|||||||
|
|
||||||
// setPortMaps sets the port maps for an app
|
// setPortMaps sets the port maps for an app
|
||||||
func setPortMaps(appName string, portMaps []PortMap) error {
|
func setPortMaps(appName string, portMaps []PortMap) error {
|
||||||
|
if err := reusesSchemeHostPort(portMaps); err != nil {
|
||||||
|
return fmt.Errorf("Error validating port mappings: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
var value []string
|
var value []string
|
||||||
for _, portMap := range uniquePortMaps(portMaps) {
|
for _, portMap := range portMaps {
|
||||||
if portMap.AllowsPersistence() {
|
if portMap.AllowsPersistence() {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ teardown() {
|
|||||||
echo "status: $status"
|
echo "status: $status"
|
||||||
assert_failure
|
assert_failure
|
||||||
|
|
||||||
run /bin/bash -c "dokku ports:add $TEST_APP http:12345:5003 http:12345:5004"
|
run /bin/bash -c "dokku ports:add $TEST_APP http:12345:5002 http:12345:5004"
|
||||||
echo "output: $output"
|
echo "output: $output"
|
||||||
echo "status: $status"
|
echo "status: $status"
|
||||||
assert_failure
|
assert_failure
|
||||||
|
|||||||
Reference in new issue
Block a user