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

fix: treat empty ps restart-policy as an unset

Browse Source 
`dokku ps:set <app> restart-policy` with no value erroneously returned `Invalid restart-policy specified` instead of unsetting the property like every other ps property. The restart policy is now managed as a normal app and global property surfaced through the `--ps-restart-policy`, `--ps-global-restart-policy`, and `--ps-computed-restart-policy` report flags, with the effective value applied at deploy time and existing values migrated on install. Because it is no longer stored as a Docker option it no longer appears in `docker-options:report`, and `--ps-restart-policy` now reports the raw value with the `on-failure:10` default available via `--ps-computed-restart-policy`.
This commit is contained in:
Jose Diaz-Gonzalez
2026-05-27 23:33:03 -04:00
parent 44dd5e9eea
commit fec872711a
9 changed files with 182 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
plugins/ps/triggers.go
View File

@@ -3,6 +3,7 @@ package ps
import (
"errors"
"fmt"
"io"
"os"
"path/filepath"
"strconv"
@@ -39,6 +40,24 @@ func TriggerCorePostDeploy(appName string) error {
return common.PropertyWrite("ps", appName, "restore", "true")
}
// TriggerDockerArgsProcessDeploy injects the computed restart policy as a
// `--restart=` docker option at deploy time. The value is no longer persisted
// in the docker-options store; it is derived from the app/global restart-policy
// property on every deploy.
func TriggerDockerArgsProcessDeploy(appName string) error {
stdin, err := io.ReadAll(os.Stdin)
if err != nil {
return err
}
if _, err := os.Stdout.Write(stdin); err != nil {
return err
}
fmt.Printf(" --restart=%s", reportComputedRestartPolicy(appName))
return nil
}
// TriggerCorePostExtract ensures that the main Procfile is the one specified by procfile-path
func TriggerCorePostExtract(appName string, sourceWorkDir string) error {
destination := common.GetAppDataDirectory("ps", appName)
@@ -104,16 +123,22 @@ func TriggerInstall() error {
}
for _, appName := range apps {
policies, err := getRestartPolicy(appName)
policy, err := getRestartPolicy(appName)
if err != nil {
return err
}
if len(policies) != 0 {
if policy == "" {
continue
}
if err := dockeroptions.AddDockerOptionToPhases(appName, []string{"deploy"}, "--restart=on-failure:10"); err != nil {
if policy != DefaultProperties["restart-policy"] {
if err := common.PropertyWrite("ps", appName, "restart-policy", policy); err != nil {
common.LogWarn(err.Error())
}
}
if err := dockeroptions.RemoveDockerOptionFromPhases(appName, []string{"deploy"}, fmt.Sprintf("--restart=%s", policy)); err != nil {
common.LogWarn(err.Error())
}
}
@@ -210,13 +235,8 @@ func TriggerPostAppRenameSetup(oldAppName string, newAppName string) error {
return common.CloneAppData("ps", oldAppName, newAppName)
}
// TriggerPostCreate ensures apps have a default restart policy
// and scale value for web
// TriggerPostCreate ensures apps have a default scale value for web
func TriggerPostCreate(appName string) error {
if err := dockeroptions.AddDockerOptionToPhases(appName, []string{"deploy"}, "--restart=on-failure:10"); err != nil {
return err
}
if err := common.CreateAppDataDirectory("ps", appName); err != nil {
return err
}
@@ -319,6 +339,7 @@ func TriggerPsSetScale(appName string, skipDeploy bool, clearExisting bool, proc
func TriggerPsGetProperty(appName string, property string) error {
computedValueMap := map[string]common.ReportFunc{
"restart-policy": reportComputedRestartPolicy,
"restore": reportRestore,
"skip-deploy": reportComputedSkipDeploy,
"stop-timeout-seconds": reportComputedStopTimeoutSeconds,