diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-04-16 21:54:31 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-04-20 16:11:36 -0400 |
| commit | e62d08177024ab237d543d6f19c79631defece33 (patch) | |
| tree | 286951e72a8dd6c23c4b2a41513d18f43a930647 /libpod/container_internal_linux.go | |
| parent | 5928e8fe80e1f013049f1a980a4c945ee35570c3 (diff) | |
| download | podman-e62d08177024ab237d543d6f19c79631defece33.tar.gz podman-e62d08177024ab237d543d6f19c79631defece33.tar.bz2 podman-e62d08177024ab237d543d6f19c79631defece33.zip | |
Update podman to use containers.conf
Add more default options parsing
Switch to using --time as opposed to --timeout to better match Docker.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
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" |