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

fix: correct lint errors

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2017-07-22 15:32:14 -06:00
committed by Michael Hobbs
parent 3b9f4ba63f
commit a3abf8016b
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/common/common.go
View File

@@ -157,8 +157,8 @@ func VerifyImage(image string) bool {
}
// ContainerIsRunning checks to see if a container is running
func ContainerIsRunning(containerId string) bool {
b, err := DockerInspect(containerId, "'{{.State.Running}}'")
func ContainerIsRunning(containerID string) bool {
b, err := DockerInspect(containerID, "'{{.State.Running}}'")
if err != nil {
return false
}
@@ -176,13 +176,13 @@ func DirectoryExists(filePath string) bool {
}
// DockerInspect runs an inspect command with a given format against a container id
func DockerInspect(containerId, format string) (string, error) {
b, err := sh.Command("docker", "inspect", "--format", format, containerId).Output()
func DockerInspect(containerID, format string) (string, error) {
b, err := sh.Command("docker", "inspect", "--format", format, containerID).Output()
if err != nil {
return "", err
}
output := strings.TrimSpace(string(b[:]))
if strings.HasPrefix(output, "'") && strings.HasSuffix(output, "'") {
if strings.HasPrefix(output, "'") && strings.HasSuffix(output, "'") {
output = strings.TrimSuffix(strings.TrimPrefix(output, "'"), "'")
}
return output, err
@@ -270,7 +270,7 @@ func GetAppImageName(appName, imageTag, imageRepo string) (imageName string) {
return
}
// return true if given app has a running container
// IsDeployed returns true if given app has a running container
func IsDeployed(appName string) bool {
dokkuRoot := MustGetEnv("DOKKU_ROOT")
appRoot := strings.Join([]string{dokkuRoot, appName}, "/")

4
plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go
View File

@@ -15,8 +15,8 @@ func main() {
appName := flag.Arg(0)
procType := flag.Arg(1)
isHerokuishContainer := common.ToBool(flag.Arg(2))
containerId := flag.Arg(3)
containerID := flag.Arg(3)
ipAddress := network.GetContainerIpaddress(appName, procType, isHerokuishContainer, containerId)
ipAddress := network.GetContainerIpaddress(appName, procType, isHerokuishContainer, containerID)
fmt.Fprintln(os.Stdout, ipAddress)
}

4
plugins/network/src/triggers/network-get-port/network-get-port.go
View File

@@ -15,8 +15,8 @@ func main() {
appName := flag.Arg(0)
procType := flag.Arg(1)
isHerokuishContainer := common.ToBool(flag.Arg(2))
containerId := flag.Arg(3)
containerID := flag.Arg(3)
port := network.GetContainerPort(appName, procType, isHerokuishContainer, containerId)
port := network.GetContainerPort(appName, procType, isHerokuishContainer, containerID)
fmt.Fprintln(os.Stdout, port)
}