diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-21 05:21:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 05:21:09 -0400 |
| commit | 47d99fb6253238e7603fc96d5b9bbb14f1e8c948 (patch) | |
| tree | 23f7e52d04fe78df60ba1a94c1ef5e7106ff8e82 /libpod/container_internal_linux.go | |
| parent | 8884f6a4f357ea64ad5f20f791ec0a09bdd36352 (diff) | |
| parent | 532c7343a9af5fbdcc682f7f93c987b1f1e49b41 (diff) | |
| download | podman-47d99fb6253238e7603fc96d5b9bbb14f1e8c948.tar.gz podman-47d99fb6253238e7603fc96d5b9bbb14f1e8c948.tar.bz2 podman-47d99fb6253238e7603fc96d5b9bbb14f1e8c948.zip | |
Merge pull request #5647 from rhatdan/containers.conf
Update podmanV2 to use containers.conf
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index c40ad45b9..38dfa7ab7 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -20,11 +20,11 @@ import ( cnitypes "github.com/containernetworking/cni/pkg/types/current" "github.com/containernetworking/plugins/pkg/ns" "github.com/containers/buildah/pkg/secrets" + "github.com/containers/common/pkg/apparmor" "github.com/containers/common/pkg/config" "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/events" "github.com/containers/libpod/pkg/annotations" - "github.com/containers/libpod/pkg/apparmor" "github.com/containers/libpod/pkg/cgroups" "github.com/containers/libpod/pkg/criu" "github.com/containers/libpod/pkg/lookup" |