1308e21947
Standardize how environment variables are migrated to properties during install triggers and migrate all remaining DOKKU_* config vars to their appropriate plugin properties. Adds a reusable MigrateConfigToProperties() function in the common package with Transform callback and ListProperty support, plus a migrate-config-to-property subcommand for the prop binary so shell plugins can use the same code path. Migrated variables and their new property owners: - DOKKU_APP_PROXY_TYPE/DOKKU_PROXY_TYPE → proxy type - DOKKU_DISABLE_PROXY → proxy disabled - DOKKU_PROXY_PORT → ports proxy-port - DOKKU_PROXY_SSL_PORT → ports proxy-ssl-port - DOKKU_APP_RESTORE → ps restore - DOKKU_SKIP_DEPLOY → ps skip-deploy - DOKKU_START_CMD → ps start-cmd - DOKKU_DOCKERFILE_START_CMD → ps dockerfile-start-cmd - DOKKU_DISABLE_APP_AUTOCREATION → apps disable-autocreation - DOKKU_APP_SHELL → scheduler shell - DOKKU_SKIP_CLEANUP → builder skip-cleanup - DOKKU_CHECKS_DISABLED → checks disabled - DOKKU_CHECKS_SKIPPED → checks skipped - DOKKU_CHECKS_WAIT → checks wait - DOKKU_CHECKS_TIMEOUT → checks timeout - DOKKU_CHECKS_ATTEMPTS → checks attempts - DOKKU_DEFAULT_CHECKS_WAIT → checks default-wait - DOKKU_SKIP_ALL_CHECKS → checks disabled (legacy) - DOKKU_SKIP_DEFAULT_CHECKS → checks skipped (legacy) Also refactors existing bespoke migration loops in scheduler, ports, ps, builder, and nginx-vhosts plugins to use the standardized utility. Removes DOKKU_PARALLEL_ARGUMENTS from documentation (unused in core). Deprecates fn-migrate-config-to-property bash function. closes #1558
41 lines
1003 B
Go
41 lines
1003 B
Go
package ports
|
|
|
|
import (
|
|
"fmt"
|
|
)
|
|
|
|
var (
|
|
// DefaultProperties is a map of all valid ports properties with corresponding default property values
|
|
DefaultProperties = map[string]string{
|
|
"proxy-port": "",
|
|
"proxy-ssl-port": "",
|
|
}
|
|
|
|
// GlobalProperties is a map of all valid global ports properties
|
|
GlobalProperties = map[string]bool{
|
|
"proxy-port": true,
|
|
"proxy-ssl-port": true,
|
|
}
|
|
)
|
|
|
|
// PortMap is a struct that contains a scheme:host-port:container-port mapping
|
|
type PortMap struct {
|
|
// ContainerPort is the port on the container
|
|
ContainerPort int `json:"container_port"`
|
|
|
|
// HostPort is the port on the host
|
|
HostPort int `json:"host_port"`
|
|
|
|
// Scheme is the scheme of the port mapping
|
|
Scheme string `json:"scheme"`
|
|
}
|
|
|
|
func (p PortMap) String() string {
|
|
return fmt.Sprintf("%s:%d:%d", p.Scheme, p.HostPort, p.ContainerPort)
|
|
}
|
|
|
|
// AllowsPersistence returns true if the port map is not to be persisted
|
|
func (p PortMap) AllowsPersistence() bool {
|
|
return p.Scheme == "__internal__"
|
|
}
|