summaryrefslogtreecommitdiff
path: root/cmd/podman/common
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-10 08:42:16 -0400
committerGitHub <noreply@github.com>2020-06-10 08:42:16 -0400
commit63468464e8365adefebee7127be888ea649edd8e (patch)
tree1b4d8c8a9af7736f5f4cc813d7897341a3c2b27c /cmd/podman/common
parent9967f28339dc43c97966bc07345af53a374faf67 (diff)
parent87718c4e676dc503f67ca6f283c4242cf19f9eb7 (diff)
downloadpodman-63468464e8365adefebee7127be888ea649edd8e.tar.gz
podman-63468464e8365adefebee7127be888ea649edd8e.tar.bz2
podman-63468464e8365adefebee7127be888ea649edd8e.zip
Merge pull request #6546 from rhatdan/lint
Turn on golint
Diffstat (limited to 'cmd/podman/common')
-rw-r--r--cmd/podman/common/default.go2
-rw-r--r--cmd/podman/common/specgen.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/common/default.go b/cmd/podman/common/default.go
index 7233b2091..6e5994b18 100644
--- a/cmd/podman/common/default.go
+++ b/cmd/podman/common/default.go
@@ -16,5 +16,5 @@ var (
// DefaultImageVolume default value
DefaultImageVolume = "bind"
// Pull in configured json library
- json = registry.JsonLibrary()
+ json = registry.JSONLibrary()
)
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go
index 26003b40f..2286e67de 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -669,7 +669,7 @@ func makeHealthCheckFromCli(inCmd, interval string, retries uint, timeout, start
hc.Interval = intervalDuration
if retries < 1 {
- return nil, errors.New("healthcheck-retries must be greater than 0.")
+ return nil, errors.New("healthcheck-retries must be greater than 0")
}
hc.Retries = int(retries)
timeoutDuration, err := time.ParseDuration(timeout)