Commit Graph

61 Commits

Author SHA1 Message Date
OpenShift Merge Robot 33633ba029 Merge pull request #678 from vikas-goel/prepare-volume
User option to prepare container after creation for volume copy-up.
2021-07-15 09:22:09 -04:00
Vikas Goel a7668c208f User option to prepare container after creation for volume copy-up.
Docker does this by default.

Relates to podman#10262

[NO TESTS NEEDED]

Signed-off-by: Vikas Goel <vikas.goel@gmail.com>
2021-07-14 12:12:15 -07:00
Matej Vasek 61d2ae986d add config option for ChownCopiedFiles
Signed-off-by: Matej Vasek <mvasek@redhat.com>
2021-07-13 18:17:12 +02:00
Daniel J Walsh e3dc20ea75 Fix default definition of secrets in containers.conf
We had a bogus setting for secrets in our default containers.conf
[secret] should have been [secrets].

Also added a test to make sure this never happens again.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-07-05 06:37:28 -04:00
OpenShift Merge Robot 10fc9ceca2 Merge pull request #615 from rhatdan/config
Add support for config drop in directories
2021-06-10 16:44:15 -04:00
Daniel J Walsh 4c51429098 Add support for config drop in directories
Fixes: https://github.com/containers/common/issues/368

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-06-10 16:34:26 -04:00
OpenShift Merge Robot 29f2dfdb02 Merge pull request #616 from rhatdan/sort
[NO TESTS NEEDED] Sort containers.conf and containers.conf.5.md
2021-06-10 16:25:18 -04:00
Tino Rusch 5ec160696b add 'secret' section to the containers.conf struct. 2021-06-10 14:04:32 +02:00
Daniel J Walsh 22d8d4282d Sort containers.conf and containers.conf.5.md
Remove cgroup_check which is no longer needed.

Fixes: https://github.com/containers/common/issues/372

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-06-10 07:03:30 -04:00
Daniel J Walsh 9c89b403e7 Add default for log-tag
Needed for https://github.com/containers/podman/issues/10204

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-06-09 08:43:07 -04:00
Brent Baude cf1c43959f rootless networking
Set type of rootless networking with:

rootless_networking = "slirp4netns | cni"

slirp is the default

Signed-off-by: Brent Baude <bbaude@redhat.com>
2021-05-20 15:34:44 -05:00
Valentin Rothberg 2d3c57daa0 adjust log-driver defaults
Commit ebfe786429 changed the default logging driver k8s-file to
journald.  The only consumer of the log-driver is Podman which I think
still needs some more time to stabilize.  Vendoring containers/common
into Podman has revealed quite some warts (see
containers/podman/pull/10222) which reduced my confidence level.

To resolve the chicken-egg-problem of maturing the journald driver, I
want to only partially revert commit ebfe786429.  The built-in default
remains k8s-file while the containers.conf sets it to journald.  The
intention behind is to make sure that running systems are not impacted
but we can change Fedora to journald to increase coverage.

Once the confidence level is back to normal, we can change the default
to journald.  Latest before RHEL9.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-05-12 14:13:04 +02:00
OpenShift Merge Robot ba743c0fdb Merge pull request #518 from rhatdan/journald
Swap default logging to journald
2021-05-05 11:18:10 -04:00
Matthew Heon 85df6670fb Add ability to specify a subnet for the default network
This lays the foundation for c/common to be able to create the
default CNI configuration file itself.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-05-04 11:40:22 -04:00
Daniel J Walsh ebfe786429 Swap default logging to journald
This eliminates the concern of log files growing infinitely and also
records all containers for posterity rather then allowing the removal
of a container to destroy the record.

Partially fixes: https://github.com/containers/podman/issues/9158

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-04-29 13:32:50 -04:00
OpenShift Merge Robot 9724f1b55e Merge pull request #510 from rhatdan/parallel
Add support for the runsc OCI Runtime
2021-04-26 15:45:14 -04:00
Daniel J Walsh 671db86c0d Add support for the runsc OCI Runtime
Based on https://github.com/containers/common/pull/507 PR.

Thanks to unknowndev233 unknowndevQwQ@protonmail.com whoever they are.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-04-24 06:11:10 -04:00
Ashley Cui 24f4991dc1 Add support for machine_enabled in containers.conf
machine_enabled is a bool that indicates if Podman is running in a
podman-machine VM

Signed-off-by: Ashley Cui <acui@redhat.com>
2021-04-23 14:37:18 -04:00
Daniel J Walsh cfcb868490 Add missing values to containers.conf man bpage
Fix some alphabetic sorting.

Add missing default_network setting to containers.conf

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-02-09 14:17:48 -05:00
pacoxu 6e9f831375 update pause image to 3.4.1 2021-02-08 14:25:28 +08:00
Valentin Rothberg 592498d52b Revert "Change default log driver to journald"
This reverts commit 451f5fb68b.

Journald is not yet passing Podman CI.  We need to temporarily revert
the commit to unblock secrets work.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-02-05 21:28:22 +01:00
Daniel J Walsh 0f802d0065 Add image_default_format
Currently when pulling/pushing images we default to the format
of the source image.  When Building images we default to OCI.

Customers have asked us to allow them to force a specific image
type when pushing to a registry.

We already have a flag to building images.

This PR adds image_default_format to define the format to be used
by all tools create/building/pulling and pusing images.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-02-01 06:38:50 -05:00
Daniel J Walsh 451f5fb68b Change default log driver to journald
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-01-30 07:57:07 -05:00
Daniel J Walsh 952d2c9991 Add image_parallel_copies engine config
This will allow users to configure the amount of parallel copies that
the container engines are allowed to do. This allows users to configure
their systems to match their available network settings.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-01-21 14:59:34 -05:00
Daniel J Walsh 58231b6407 http_proxy is supposed to default to true.
In the containers.conf we default to true, but in code and man page
it is defaulted to false. Since Podman wants it defaulted to true
we need to change default and man page to match.

Also fixed the testing for SELinux, which would never succeed on an SELinux box.

Helps fix: https://github.com/containers/podman/pull/8844

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-12-29 08:04:52 -05:00
Daniel J Walsh ec4a98a333 Switch references of /var/run -> /run
Systemd is now complaining or mentioning /var/run as a legacy directory.
It has been many years where /var/run is a symlink to /run on all
most distributions, make the change to the default.

Partial fix for https://github.com/containers/podman/issues/8369

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-12-18 06:27:41 -05:00
Daniel J Walsh 44e14b12b9 Find ociruntime instead of hard coding default
Users could have any one of the OCI runtimes installed,
code will search for default.  This way they do not need
to modify defaults if they have "crun" installed.

Search order will be crun, runc, kata

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-12-15 05:43:45 -05:00
Matthew Heon 33a960773b Add a volume plugins field to containers.conf
We decided that making users explicitly list plugins they wanted
to use was not a bad thing, and greatly simplifies our
implementation. As such, we need a place to do that, and
`containers.conf` is the logical location.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-12-04 13:48:24 -05:00
Daniel J Walsh d568d40354 Add ability to set system wide options for slirp4netns
Also fixup some formatting issues in man pages.

Fix generation of multiple man pages.

Partial fix for: https://github.com/containers/podman/issues/7888

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-11-25 13:42:53 -05:00
Daniel J Walsh 69ee79b12c Add support for enabling/disabling kernel keyring in engines
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-11-20 13:39:24 -05:00
Daniel J Walsh 83bda5699e Move buildah/pkg/secrets to common/pkg/subscriptions
Since secrets is shared by buildah, podman and cri-o, we need
to move it to containers/common.

Also move containers-mounts.conf.5.md to common from podman,
since this is common to all packages.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-11-19 10:31:58 -05:00
Daniel J Walsh 86a01f6857 Enabled the remote flag to be accessible by users
This flag would allow users to run the podman command
in podman-remote mode by default. If you are primarily using
podman to access a remote server, you might want to enable this
flag and not have to install podman-remote as well as podman command.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-10-30 05:11:43 -04:00
Daniel J Walsh e2055b6dcc Fix description of no-common options for cgroups
The current description is wrong it says that no-common does
not use cgrous, when it should say there is no cgroup
created for the conmon process.

Fixes: https://github.com/containers/common/issues/321

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-10-09 13:32:04 -04:00
Daniel J Walsh d2c4ee7ce3 Allow users to specify the default format for image builds
Some users want to stick to "docker" format escecially since some older
container registries don't properly support OCI images.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-09-21 16:13:48 -04:00
Daniel J Walsh 1ef1790040 Add TERM=xterm to default setting for env
We want to make sure that the TERM envionment variable is always
set.  TERM defaulted to ansi might be better, but we want to match
Docker defaults, so we will stick at xterm.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-18 11:37:15 -04:00
Daniel J Walsh 964d22fabd Add CONTAINERS_STORAGE_CONF Environment hanlding for testing
Currently it is difficult to modify the path to the storage.conf
file for setting up testing. It is hard coded to use /etc/containers/storage.conf.

Adding this envionment variable, will allow us to write tests on storage.conf
that do not override the system defaults.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-17 14:27:04 -04:00
Valentin Rothberg f217b00ded multi_image_archive: add option for `podman save`
Add an option to control the default behavior of `podman save` or other
container engines.  If set to "true", the engine will create a
multi-image (docker) archive.  By default, Podman will interpret
additional arguments as tags that'll be stored in the archive's
manifest.  Docker interprets additional arguments as images to allow for
creating multi-image archives.  This option allows users to chose how
they wish the default behavior to look like, so we don't break
compatibility with existing Podman workloads while being compatible
with Docker.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-08-17 14:44:43 +02:00
Ashley Cui 07d027889c Fix documentation
Fix a bunch of formatting nits for consistency's sake

Signed-off-by: Ashley Cui <acui@redhat.com>
2020-08-03 14:25:54 -04:00
Daniel J Walsh f6135d97d2 Fix documenation
hooks_dir_path was in wrong location, should be under Enigne section

network_cmd_path was not documented.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-01 07:06:28 -04:00
Tom Sweeney b0dff4761d Merge pull request #223 from ashley-cui/umask
Add support for Umask
2020-07-15 19:43:44 -04:00
Jhon Honce 4f496fde52 Add support for multiple service destinations
Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-07-15 14:02:00 -07:00
Ashley Cui 93a6847b2d Add support for Umask
Signed-off-by: Ashley Cui <acui@redhat.com>
2020-07-15 13:59:29 -04:00
Daniel J Walsh 560bd489ae Merge pull request #200 from ashley-cui/master
Add support for timezone
2020-06-30 17:07:39 -04:00
Ashley Cui bf1b8b15b6 Add support for timezone
Signed-off-by: Ashley Cui <acui@redhat.com>
2020-06-30 15:07:49 -04:00
Qi Wang 3d8b92bdb2 Specify container engine in comments of engine env
Specify that the container engines are Podman, Buildah

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-06-30 11:59:46 -04:00
Qi Wang 82a0ff9d5c Add container_engine_env for engine to use
Add container_env_var for setting envariables for engin to use.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-06-29 16:50:14 -04:00
Daniel J Walsh 9839b10d40 Fixup handling of remote_uri for documentation
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-06-23 12:48:26 -04:00
Daniel J Walsh c58a215838 Add support for cgroups configuration
We need to be able to disable cgroups when running container engines inside of containers.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-13 13:56:16 -04:00
Daniel J Walsh c719975a94 Add RuntimeSupportsKVM to config.Engine
We need to identify the list of containers that support KVM separation, these
containers can run with a different SELinux label, and we might be able to
make different decisions in the container engines about how to launch these
containers.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-07 10:11:59 -04:00
Valentin Rothberg ebd70f1b13 use `pause:3.2` image for infra containers
The `pause:3.1` has wrong configs for non-amd64 images as they all claim
to be for amd64.  The issue has now been fixed in the latest
`pause:3.2`.

[1] https://github.com/kubernetes/kubernetes/issues/87325

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-03-27 13:45:23 +01:00