diff options
| author | baude <bbaude@redhat.com> | 2017-11-03 14:37:22 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-11-17 02:07:18 +0000 |
| commit | d2eda1a8648b7e6053627e48bf500f9671f0a6c2 (patch) | |
| tree | 0b86ea7165ab02003b9e6fc480432774a72724a6 /libpod/runtime_img.go | |
| parent | bf8b9a37df2aeead009996875f58c59625110472 (diff) | |
| download | podman-d2eda1a8648b7e6053627e48bf500f9671f0a6c2.tar.gz podman-d2eda1a8648b7e6053627e48bf500f9671f0a6c2.tar.bz2 podman-d2eda1a8648b7e6053627e48bf500f9671f0a6c2.zip | |
Enhancements to papr tests
The PR contains several enhancements to our CI testing.
- enable lint testing on Fedora
- add Centos Atomic as test platform
- integration tests on run on the OS natively (uncontainerized)
- builds are done in containers
- inclusion of Vagrant file for local testing
Signed-off-by: baude <bbaude@redhat.com>
Closes: #18
Approved by: mheon
Diffstat (limited to 'libpod/runtime_img.go')
| -rw-r--r-- | libpod/runtime_img.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index 0fa003799..eb9976d9b 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -118,7 +118,7 @@ type Image struct { Name string ID string fqname string - hasImageLocal bool + hasImageLocal bool //nolint runtime *Runtime Registry string ImageName string @@ -359,10 +359,7 @@ func (k *Image) HasLatest() (bool, error) { return false, err } _, _, err = pullRef.(types.ImageSource).GetManifest() - if err != nil { - return false, err - } - return false, nil + return false, err } // Pull is a wrapper function to pull and image @@ -1155,7 +1152,8 @@ func ParseImageNames(names []string) (tags, digests []string, err error) { return tags, digests, nil } -func annotations(manifest []byte, manifestType string) map[string]string { +// Remove nolint when used +func annotations(manifest []byte, manifestType string) map[string]string { //nolint annotations := make(map[string]string) switch manifestType { case ociv1.MediaTypeImageManifest: |