github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: correct issue where resource setting was overriding pre-existing values

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2019-05-17 11:58:53 -04:00
parent c786b9e45e
commit ceac86b58f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/resource/subcommands.go
View File

@@ -121,10 +121,11 @@ func setResourceType(appName string, processType string, r Resource, resourceTyp
common.LogInfo2Quiet(message) common.LogInfo2Quiet(message)
for key, value := range resources { for key, value := range resources {
if value != "" { if value == "" {
common.LogVerbose(fmt.Sprintf("%v: %v", key, value)) continue
} }
common.LogVerbose(fmt.Sprintf("%v: %v", key, value))
property := propertyKey(processType, resourceType, key) property := propertyKey(processType, resourceType, key)
err := common.PropertyWrite("resource", appName, property, value) err := common.PropertyWrite("resource", appName, property, value)
if err != nil { if err != nil {

5
tests/unit/20_resource.bats
View File

@@ -116,6 +116,11 @@ teardown() {
echo "status: $status" echo "status: $status"
assert_success assert_success
run /bin/bash -c "dokku resource:reserve --cpu 1.5 --process-type worker $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
dokku ps:rebuild "$TEST_APP" dokku ps:rebuild "$TEST_APP"
CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1) CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID" run /bin/bash -c "docker inspect --format '{{.HostConfig.MemoryReservation}}' $CID"