Commit Graph

105 Commits

Author SHA1 Message Date
Valentin Rothberg 1cb045b421 containers.conf: add pod_exit_policy
Add a new `pod_exit_policy` field to the containers.conf's engine table.
A pod's exit policy determines the behaviour when the last container of
a pod exits.

Required-in: containers/podman/pull/13859
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-04-29 12:17:16 +02:00
Daniel J Walsh af1f3558c7 Change rootfull->rootful
[NO NEW TESTS NEEDED] Just a docs change.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-04-25 13:50:12 -04:00
Jason T. Greene 77d8f70039 Deprecate MachineEnabled and replace with API
machine.IsPodmanMachine replaces MachineEnabled
machine.MachineHostType informs the type unknown, qemu, wsl, etc
machine.IsGvProxyBased used to make specific determinations re gvproxy

Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
2022-04-23 12:32:54 -05:00
OpenShift Merge Robot 14485d3f32 Merge pull request #1006 from Luap99/ipv6-slirp
pkg/config: fix docs for network_cmd_options
2022-04-21 07:11:03 -04:00
Paul Holzinger ce62c07f22 add host_containers_internal_ip to containers.conf
Set the ip for the host.containers.internal entry in the containers /etc/hosts
file. This can be set to "none" to disable adding this entry. By default it
will automatically choose the host ip.

Also add a function to get the correct host.containers.internal ip. This
should be used by podman and buildah and then passed to the New()
function.

Ref https://github.com/containers/podman/issues/13224

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-04-21 11:48:36 +02:00
Paul Holzinger a3b0ae033e add base_hosts_file field to containers.conf
base_hosts_file can be used to overwrite the default base host file
/etc/hosts which is used to copy hosts entries from this file into the
containers /etc/hosts file. As special value "image" can be used to copy
the entries from the image hosts file or "none" to not use a base file
at all. IF the value is empty we should use /etc/hosts as default.

Ref https://github.com/containers/podman/issues/13277
Ref https://github.com/containers/podman/issues/13748

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-04-21 11:39:56 +02:00
Paul Holzinger d154daf361 pkg/config: fix docs for network_cmd_options
Slirp4netns options were changed to always default to ipv6 so it does
not need the extra setting. Update the documentation to reflect this.

see https://github.com/containers/podman/pull/13929

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-04-20 14:56:31 +02:00
Niall Crowe a894dd11a3 pkg/config: new value for events_logfile_max_size
Changing the value for events_logfile_max_size from 0 to 1048576. This allows
up to 10,000 events to be written to the events log file before rotation occurs.
Also adding new values to default.go

Signed-off-by: Niall Crowe <nicrowe@redhat.com>
2022-04-20 10:23:50 +01:00
Daniel J Walsh a3e25551d0 Add machine volumes to containers.conf
This will allow users to specify which volumes they want podman machine
to automatically mount into the machine. These volumes can later be used
to volume mount into containers.

Environment variables like $HOME can be used and are translated at the
time of machine start.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-04-13 07:33:17 -04:00
Kir Kolyshkin a263ddda2d Fix typos found by codespell
Brought to you by

	make codespell

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2022-03-30 11:13:44 -07:00
Daniel J Walsh efb7ac046b Add .containerignore.5 link file so users can find man page
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-03-22 16:34:59 -04:00
Daniel J Walsh 54be5eba7e IPCMode default mode should be sharable not private
Docker defined --ipc=private to mean that the container's IPC Namespace
can NOT be shared with another container.  While --ipc=shareable can,
which is our current default.  Docker also defines "none" which means
the container runs in a IPC namespace but does NOT mount a /dev/shm.
"Host" means the container runs in the host namespace, and
container:UUID means run new container in other containers namespace.
ns:PATH means run in the namepsace designated in PATH.2

This Patch, fixes containers/common to reflect the correct default.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-03-22 07:25:59 -04:00
Niall Crowe ccad158a8b containers.conf: add events_logfile_max_size
Add a new option to the `[engine]` table in containers.conf
for specifying the maximum size of `events_logfile_path`.
Once exceeded, Podman will rotate the logfile and delete
the old one.

Also add tests to make sure we're not regressing in the future.

Signed-off-by: Niall Crowe <nicrowe@redhat.com>
2022-03-16 14:32:59 +00:00
Rover van der Noort 87dcc5729f Add ExitCommandDelay as configuration in EngineConfig with default of 5 minutes in seconds.
Signed-off-by: Rover van der Noort <s.r.vandernoort@student.tudelft.nl>
2022-02-24 15:51:05 +01:00
OpenShift Merge Robot e9861715cb Merge pull request #905 from Foxboron/morten/move-manpages
docs: Reintroduce Containerfile and containerignore
2022-02-22 13:52:51 -05:00
OpenShift Merge Robot 28e1ee0625 Merge pull request #931 from Luap99/subnets
add default_subnet_pools to containers.conf
2022-02-15 11:19:40 -05:00
Paul Holzinger b76062811b pkg/config: add new default_subnet_pools field
Add a new field to set the default subnet pools. They can be used to
change the subnet which is automatically allocated by podman network
create.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-02-15 15:29:19 +01:00
Valentin Rothberg c1ee93d3a8 docs: move `volumes` under containers table
`volumes` were mistakenly listed under the network table.

Fixes: containers/common#928
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-02-15 09:41:07 +01:00
Erik Sjölund bc5ea7c89e Fix typos and improve language
Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
2022-01-30 17:15:02 +01:00
Daniel J Walsh e24561828a Change infra_image default to ""
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-01-27 16:42:18 -05:00
Morten Linderud c792481854 docs: Reintroduce Containerfile and containerignore
These where moved to buildah but because they are useful for podman and
the other tooling they are moved back into the common project.

Reverts 6b57bd6c7c

Signed-off-by: Morten Linderud <morten@linderud.pw>
2022-01-25 22:42:59 +01:00
Paul Holzinger 4eb265ce95 remove rootless_networking field from containers.conf
This field was only needed for machine to force cni, however you can set
netns="bridge" in the config to have the same effect. This is already
done in the machine setup.

The field was more of a hack and just creates confusion for users so we
remove it.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-01-20 16:23:12 +01:00
OpenShift Merge Robot 98fa4baa5c Merge pull request #889 from Luap99/netavark-root
netavark: use globally shared network config dir
2022-01-17 15:57:19 +01:00
Paul Holzinger abb7b535b6 add network documentation for netavark
* change cni networks to just networks since they also refer to netavark
  networks
* add documentation about the network_backend key and what the empty
  value means

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-01-17 15:36:34 +01:00
Paul Holzinger 995cdaae8f netavark: use globally shared network config dir
Since the network namespace is shared for all rootful libpod instances
we also need to make sure to use the same network config dir and run dir
to ensure that we do not use the same subnet or ip for more than one
container.

Also update the documentation about the network_config_dir field.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-01-17 15:36:03 +01:00
Daniel J Walsh 4c67daff69 Document the events_logfile_path field in containers.conf
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-01-14 12:18:23 -05:00
Jason T. Greene d813c5e6fb Add platform driven image and user defaults for podman machine
Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
2021-12-09 14:37:54 -06:00
Giuseppe Scrivano f0262407d0 config: add CompressionFormat option
support changing the default compression format in the containers.conf
config file.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2021-12-02 15:56:43 +01:00
Matthew Heon 8b1b879924 Add network_backend field for switching to netavark
This field determines whether CNI or netavark will be used to
create container networks. Default presently set to "cni".

Signed-off-by: Matthew Heon <mheon@redhat.com>
2021-11-09 13:45:56 -05:00
Daniel J Walsh 6b57bd6c7c Moved containerfile man page to buildah
We decided that containerfile man page made more
sense in the buildah repo.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-10-01 14:51:49 -04:00
Дилян Палаузов a5f438aa10 containers.conf.5.md: simplify wording to avoit tautology
Insisting on “DCO” imposes formalities, that serve self-purpose.  One cannot
assume that the submitter has time or will to read texts about symbolism in
software contributions.  If the system wants to see the text

  nrEAUIEUAIe eanuitdnuae EAIUEAUIAIE »ℓ§444.3.72b)°»°ℓ§euaieauuae

in each commit, people will write this, or any other text, that the system wants to
see.  All such text, which presence is mandated by the system, has the same value.

Signed-off-by: Дилян Палаузов <git-dpa@aegee.org>
2021-09-24 19:24:50 +02:00
Ashley Cui bb2b17e7da Add machine table to containers.conf
Add machine teable to configure podman machine options. Move machine_image to the machine table, and add cups, disk size, and memory to the machine table.

Signed-off-by: Ashley Cui <acui@redhat.com>
2021-09-23 17:03:12 -04:00
Daniel J Walsh c9d79c2438 Add description of slirp options
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-09-17 09:33:25 -04:00
Daniel J Walsh 34010ec073 Merge branch 'main' of github.com:containers/common into ipv6 2021-09-17 07:15:03 -04:00
Daniel J Walsh b45ac6d515 Make podman system service timeout configurable in containers.conf
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-09-15 06:15:42 -04:00
Frederic Crozat c2965e479c Add support for the krun (runc running in KVM) OCI Runtime
Signed-off-by: Frederic Crozat <fcrozat@suse.com>
2021-09-14 15:57:26 +02:00
Daniel J Walsh fd50dccd46 Enable ipv6 for rootless users by default
Fixes containers/podman#10889

Inspired by @rugk

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-09-12 06:31:56 -04:00
Daniel J Walsh a5bac2096a Add support for image_copy_tmp_dir
Allow users to set the default location for the temporary files used
during image pulls and pushes.

Defaults to /var/tmp;

Overridden via "TMPDIR" environment variable.

Allow special flag "storage" to indicate the the storage should use
the tmp directory in containers/storage/tmp.

Needed to fix: https://github.com/containers/podman/issues/11107

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-09-11 04:51:27 -04:00
Paul Holzinger 25622da26e Add HelperBinariesDir field to engine config
This field contains a list of directories which should be used to store
some helper binaries, e.g. gvproxy.

Also add a FindHelperBinary method to the config struct to get the full
path to a helper binary.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2021-09-10 13:38:19 +02:00
Reinhard Tartler 32d1b83191 docs/containers.conf.5.md: Fix manpage section
Avoids a nroff warning in the generated manpage

[CI:DOCS]

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2021-09-04 18:37:13 +02:00
unknowndevQwQ 43bd1ced8a add some cni plugin paths
add some possible paths for the cni plugin to be stored

Replaces: containers/common#728

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-08-31 06:23:16 -04:00
Daniel J Walsh 241d1616a1 Add codespell fixes
[NO TESTS NEEDED] Just fixing spelling.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-08-11 16:43:59 -04:00
Daniel J Walsh 1735445f9e Add documentation for Containerfile and Dockerfile
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-08-10 13:52:26 -04:00
Ashley Cui 927da0ce99 Add machine_image to containers.conf
Signed-off-by: Ashley Cui <acui@redhat.com>
2021-08-09 15:37:06 -04:00
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