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/define | |
| 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/define')
| -rw-r--r-- | libpod/define/config.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libpod/define/config.go b/libpod/define/config.go index 17d764c65..692eafb04 100644 --- a/libpod/define/config.go +++ b/libpod/define/config.go @@ -6,10 +6,6 @@ import ( ) var ( - // DefaultInfraImage to use for infra container - DefaultInfraImage = "k8s.gcr.io/pause:3.2" - // DefaultInfraCommand to be run in an infra container - DefaultInfraCommand = "/pause" // DefaultSHMLockPath is the default path for SHM locks DefaultSHMLockPath = "/libpod_lock" // DefaultRootlessSHMLockPath is the default path for rootless SHM locks |