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

fix: override the launcher for cnb apps since the default launcher is the process launcher...

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2021-02-11 06:51:01 -05:00
parent d48cf24c4d
commit da1ddee0ba
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/app-json/functions.go
View File

@@ -164,6 +164,7 @@ func executeScript(appName string, image string, imageTag string, phase string)
common.LogInfo1(fmt.Sprintf("Executing %s task from %s: %s", phase, phaseSource, command)) common.LogInfo1(fmt.Sprintf("Executing %s task from %s: %s", phase, phaseSource, command))
isHerokuishImage := common.IsImageHerokuishBased(image, appName) isHerokuishImage := common.IsImageHerokuishBased(image, appName)
isImageCnbBased := common.IsImageCnbBased(image)
dockerfileEntrypoint := "" dockerfileEntrypoint := ""
dockerfileCommand := "" dockerfileCommand := ""
if !isHerokuishImage { if !isHerokuishImage {
@@ -224,6 +225,13 @@ func executeScript(appName string, image string, imageTag string, phase string)
if os.Getenv("DOKKU_TRACE") != "" { if os.Getenv("DOKKU_TRACE") != "" {
dockerArgs = append(dockerArgs, "--env", "DOKKU_TRACE="+os.Getenv("DOKKU_TRACE")) dockerArgs = append(dockerArgs, "--env", "DOKKU_TRACE="+os.Getenv("DOKKU_TRACE"))
} }
if isImageCnbBased {
// TODO: handle non-linux lifecycles
// Ideally we don't have to override this but `pack` injects the web process
// as the default entrypoint, so we need to specify the launcher so the script
// runs as expected
dockerArgs = append(dockerArgs, "--entrypoint=/cnb/lifecycle/launcher")
}
containerID, err := createdContainerID(appName, dockerArgs, image, script, phase) containerID, err := createdContainerID(appName, dockerArgs, image, script, phase)
if err != nil { if err != nil {