Merge pull request from baude/v2enablelint

enable linting on v2
This commit is contained in:
OpenShift Merge Robot
2020-03-26 15:16:17 +01:00
committed by GitHub
3 changed files with 4 additions and 3 deletions
.golangci.yml
pkg/domain/infra/abi

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

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

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