Commit Graph

11 Commits

Author SHA1 Message Date
Daniel J Walsh aab192bf07 Do not mention libpod.conf if no files found
We are throwing warning about libpod.conf when no files are
found.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-13 16:49:20 -04:00
Ralf Haferkamp c31f675faf Fix deprecation warnings about libpod.conf and raise log level
"Found deprecated file $HOME/.config/containers/containers.conf,
please remove." was pointing to the wrong file. Should be libpod.conf.
Also the Warning about EventsLogger had the format string args mixed
up.

Additionally raise the log level of these messages to WARN to have them
displayed more prominently.

Signed-off-by: Ralf Haferkamp <rhafer@suse.com>
2020-07-30 14:06:05 +02:00
Daniel J Walsh ef4c52742f Add full path for error messages on containers.conf
Also add new function to allow container engines to tell users
where to edit containers.conf file.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-05-26 15:36:10 -04:00
Daniel J Walsh eab34f5581 Ignore empty strings from libpod.conf
If the user has a libpod.conf file with an option of "", then
we will ignore it and use the value from containers.conf.

Also the Set variables are only to be set, if a user specified an
override command, not if they were set in the libpod.conf file.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-05-15 17:05:28 -04:00
Daniel J Walsh a5646cdc17 Hard code libpod.conf EventsLogger to File
Previous versions of podman ignored the EventsLogger setting
in libpod.conf and defaulted to "file".  Containers.conf
should follow this for backwards compatibility.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-21 12:07:47 -04:00
Daniel J Walsh ed25ff4eb6 Add more utils for returning defaults
Move pkg/sysinfo and pkg/apparmor out of libpod into containers/common.

This will allow other packages to use these libraries without requiring all of libpod.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-01 08:39:44 -04:00
Daniel J Walsh a21cf229ee Move pkg/unshare to containers/storage/pkg/unshare
This removes a circular dependancy

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-31 08:42:12 -04:00
Daniel J Walsh f935da11c9 Move SignaturePolicyPath to Engine instead of Containers
Signatures are an engine struct rather then something
per/container.  Moving to proper location.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-17 16:52:32 -04:00
Daniel J Walsh 50135a792d Change references to libpod to engine
containers/common pkg/config is for more engines then just libpod.

We want to use the 'libpod' section to configure parts of buildah.  Renaming this
section to engine, makes it more obvious to users that these fields can effect other
container engines.

Certain fields are still libpod specific, so we do not change those fields.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-11 14:56:32 -04:00
Daniel J Walsh a10366adef Drop depracated warnings to debug
Currently podman ships with libpod.conf,  We need to remove the noice
for these warnings from buildah for the time being.  We can fix this
once podman is shipping without libpod.conf.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-10 10:35:33 -04:00
Qi Wang 0c613a6abe Support and prefer libpod.conf if exists
During the transision period of replacing libpod.conf with containers.conf, pkg/config should also read the libpod.conf if it exist.
This patch reads the libpod.conf in NewConfig() and converts the configurations to ContainersConfig Struct.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-03-09 14:37:19 -04:00