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

Merge pull request #3600 from dokku/simple-herokuish-go-check

Browse Source 
Refactor IsImageHerokuishBased to match shell version
This commit is contained in:
Jose Diaz-Gonzalez
2019-06-29 17:13:02 -04:00
committed by GitHub
parent 23d647ee51 7fc8770027
commit eabcf84f0b
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/common/common.go
View File

@@ -135,8 +135,8 @@ func DirectoryExists(filePath string) bool {
} }
// DockerInspect runs an inspect command with a given format against a container id // DockerInspect runs an inspect command with a given format against a container id
func DockerInspect(containerID, format string) (output string, err error) { func DockerInspect(containerOrImageID, format string) (output string, err error) {
b, err := sh.Command(DockerBin(), "inspect", "--format", format, containerID).Output() b, err := sh.Command(DockerBin(), "inspect", "--format", format, containerOrImageID).Output()
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -246,25 +246,11 @@ func IsDeployed(appName string) bool {
// IsImageHerokuishBased returns true if app image is based on herokuish // IsImageHerokuishBased returns true if app image is based on herokuish
func IsImageHerokuishBased(image string) bool { func IsImageHerokuishBased(image string) bool {
// circleci can't support --rm as they run lxc in lxc output, err := DockerInspect(image, "{{range .Config.Env}}{{if eq . \"USER=herokuishuser\" }}{{println .}}{{end}}{{end}}")
dockerArgs := "" if err != nil {
if !FileExists("/home/ubuntu/.circlerc") { return false
dockerArgs = "--rm"
} }
return output != ""
dockerGlobalArgs := os.Getenv("DOKKU_GLOBAL_RUN_ARGS")
parts := []string{DockerBin(), "run", dockerGlobalArgs, "--entrypoint=\"/bin/sh\"", dockerArgs, image, "-c", "\"test -f /exec\""}
var dockerCmdParts []string
for _, str := range parts {
if str != "" {
dockerCmdParts = append(dockerCmdParts, str)
}
}
dockerCmd := NewShellCmd(strings.Join(dockerCmdParts, " "))
dockerCmd.ShowOutput = false
return dockerCmd.Execute()
} }
// MustGetEnv returns env variable or fails if it's not set // MustGetEnv returns env variable or fails if it's not set