opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-09 06:26:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5612 from baude/v2enablelint

Browse Source 
enable linting on v2
This commit is contained in:
OpenShift Merge Robot
2020-03-26 15:16:17 +01:00
committed by GitHub
parent c869b96d77 ba1d8ad2af
commit 8cccac5497
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.golangci.yml
View File

@ -4,6 +4,7 @@ run:
- apparmor - apparmor
- seccomp - seccomp
- selinux - selinux
- ABISupport
concurrency: 6 concurrency: 6
deadline: 5m deadline: 5m
skip-dirs-use-default: true skip-dirs-use-default: true

2
pkg/domain/infra/abi/pods.go
View File

@ -4,10 +4,10 @@ package abi
import ( import (
"context" "context"
"github.com/pkg/errors"
"github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/pkg/domain/entities" "github.com/containers/libpod/pkg/domain/entities"
"github.com/pkg/errors"
) )
func (ic *ContainerEngine) PodExists(ctx context.Context, nameOrId string) (*entities.BoolReport, error) { func (ic *ContainerEngine) PodExists(ctx context.Context, nameOrId string) (*entities.BoolReport, error) {

4
pkg/domain/infra/abi/volumes.go
View File

@ -107,7 +107,7 @@ func (ic *ContainerEngine) VolumeInspect(ctx context.Context, namesOrIds []strin
UID: v.UID(), UID: v.UID(),
GID: v.GID(), GID: v.GID(),
} }
reports = append(reports, &entities.VolumeInspectReport{&config}) reports = append(reports, &entities.VolumeInspectReport{VolumeConfigResponse: &config})
} }
return reports, nil return reports, nil
} }
@ -140,7 +140,7 @@ func (ic *ContainerEngine) VolumeList(ctx context.Context, opts entities.VolumeL
UID: v.UID(), UID: v.UID(),
GID: v.GID(), GID: v.GID(),
} }
reports = append(reports, &entities.VolumeListReport{config}) reports = append(reports, &entities.VolumeListReport{VolumeConfigResponse: config})
} }
return reports, nil return reports, nil
} }