Commit Graph

795 Commits

Author SHA1 Message Date
Valentin Rothberg 460b1b5689 Merge pull request #98 from vrothberg/pause3.2
use `pause:3.2` image for infra containers
2020-03-27 14:30:33 +01: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
Daniel J Walsh e02e740055 Merge pull request #99 from rhatdan/sysctl
Add kata containers support
2020-03-27 07:32:49 -04:00
Daniel J Walsh e0c60444e2 Fix capability testing
Also normalize the base list of capabilities.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-27 06:54:58 -04:00
Daniel J Walsh 4bb3c87228 Add kata containers support
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-27 06:54:25 -04:00
Daniel J Walsh ac6db2fcba Merge pull request #96 from Snapstromegon/master
isDirectory resolve ~ to User HomeDir
2020-03-23 18:20:19 -04:00
Tom Sweeney e7d9f46959 Merge pull request #97 from rhatdan/sysctl
Add new pkg/sysctl package
2020-03-23 11:55:54 -04:00
Daniel J Walsh badb4562d3 Add capabilities testing as well
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-23 09:17:38 -04:00
Daniel J Walsh 43b9c6d769 Add new pkg/sysctl package
Allow for the validation of sysctls passed into container engines.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-23 09:16:02 -04:00
Raphael Höser 2c144acb11 isDirectory resolve ~ to User HomeDir
When using podman by putting the prebuild binarys into the users homedirectory, paths in the config starting with "~" are not resolved as this is normally done by the shell.
Resolving "~" to HomeDir enables the user (or a config provider) to publish a config which doesn't require adaption for each user (e.G. by changing /home/<username>/usr/bin/cni as this now becomes ~/usr/bin/cni).

This commit adds a new func resolveHomeDir(string) (string, error) which resolves a given path if it contains a reference to homedir or returns the path unchanged when not.
It throws an error when it's unable to get the users HomeDir.

Signed-off-by: Raphael Höser <raphael@hoeser.info>
2020-03-21 12:18:05 +01:00
Daniel J Walsh 2d28c35a52 Merge pull request #95 from rhatdan/version
bump to v0.6.1
2020-03-18 16:43:11 -04:00
Daniel J Walsh cd421117f4 move to v0.6.2-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-18 15:50:31 -04:00
Daniel J Walsh b727c1bab7 Bump to v0.6.1
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-18 15:50:05 -04:00
Daniel J Walsh ecd0e23505 Merge pull request #94 from rhatdan/version
Fix compiling on 32 bit machines
2020-03-18 15:49:14 -04:00
Daniel J Walsh b5b50e7035 Fix compiling on 32 bit machines
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-18 15:12:47 -04:00
Daniel J Walsh 4ee039342d Merge pull request #93 from rhatdan/version
Bump to v0.6.0
2020-03-18 09:20:07 -04:00
Daniel J Walsh 8c3ed1bdde Move to v0.6.1-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-17 21:22:16 -04:00
Daniel J Walsh 17174389bd Bump to v0.6.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-17 21:21:01 -04:00
Tom Sweeney ff2bc7dc56 Merge pull request #92 from rhatdan/version
Move SignaturePolicyPath to Engine instead of Containers
2020-03-17 18:04:51 -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 cc73e65485 Merge pull request #91 from giuseppe/xdg-config-home
config: honor XDG_CONFIG_HOME
2020-03-13 10:43:08 -04:00
Giuseppe Scrivano 9322b03394 config: honor XDG_CONFIG_HOME
when the env variable is set, use its value for locating the user
configuration file.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-03-13 15:03:29 +01:00
Daniel J Walsh 88eaa67192 Merge pull request #90 from rhatdan/version
Version
2020-03-12 10:24:12 -04:00
Daniel J Walsh c015dd6d5a Move to v1.0.1-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-12 09:56:27 -04:00
Daniel J Walsh 29476208da Bump to v1.0.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-12 09:55:59 -04:00
Daniel J Walsh fb3a7428e0 Merge pull request #89 from rhatdan/master
Directories should allow for empty paths
2020-03-12 09:55:14 -04:00
Daniel J Walsh 3c6f84733a Merge pull request #87 from rhatdan/libpod-engine
Change references to libpod to engine
2020-03-12 08:59:27 -04:00
Daniel J Walsh 8fed67b97e Directories should allow for empty paths
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-12 08:49:30 -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 cc15869d2b Merge pull request #88 from rhatdan/version
Bump to v0.4.4
2020-03-11 14:26:43 -04:00
Daniel J Walsh cbed617a8a Move to v0.4.5-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-11 09:53:54 -04:00
Daniel J Walsh 6259a4939d Bump to v0.4.4
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-11 09:53:54 -04:00
Daniel J Walsh 12d868d1c5 Merge pull request #86 from rhatdan/StorageConfig
Drop StorageConfig from containers config structures
2020-03-11 07:11:33 -04:00
Daniel J Walsh cf37573798 Drop StorageConfig from containers config structures
Callers should use containers/storage directly.

Also remove MergeDBConfig, this is no longer used by any callers.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-11 05:39:35 -04:00
Daniel J Walsh 0f88d7d4d8 Merge pull request #84 from rhatdan/version
Drop deprecated warnings to debug
2020-03-10 13:08:46 -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
Daniel J Walsh 0b81b655d3 Merge pull request #83 from rhatdan/version
Version
2020-03-10 08:22:38 -04:00
Daniel J Walsh 7630f4ffc2 Move to v0.4.4-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-10 08:21:47 -04:00
Daniel J Walsh 52b624fd7d Bump to v0.4.3
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-10 08:21:47 -04:00
Daniel J Walsh 4503c2b249 Merge pull request #81 from rhatdan/master
NewConfig(): passed-in configuration file should matter most
2020-03-10 08:19:44 -04:00
Daniel J Walsh 357a5402c6 NewConfig(): passed-in configuration file should matter most
In NewConfig(), settings in the file whose name we're passed should
matter more than the hardwired default files, or the file named in the
CONTAINERS_CONF environment variable.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-09 17:29:26 -04:00
Daniel J Walsh 66647dd5c2 Merge pull request #80 from QiWang19/rm_cgroup_check
remove CgroupsAndAdjust from NewConfig
2020-03-09 16:59:22 -04:00
Qi Wang eee0f4f7f8 remove CgroupsAndAdjust from NewConfig
Export CheckCgroupsAndAdjustConfig() as global function and remove it from NewConfig(). So we can handle it in libpod and avoid Buildah to display cgroup warning message when reading containers.conf.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-03-09 15:18:15 -04:00
Daniel J Walsh 7508a6e72d Merge pull request #78 from QiWang19/merge_libpodconf
Support and prefer libpod.conf if exists
2020-03-09 14:57:04 -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
Daniel J Walsh 8ce8607656 Merge pull request #77 from QiWang19/run-pull
Add pull_policy to LibpodConfig
2020-03-03 14:40:06 -05:00
Qi Wang bec93b6703 Add pull_policy to LibpodConfig
pull_policy is the same as podman run --pull option to determin whether to pull a new image when running a container.
Accepted "always", "missing", and "never". Default value is "missing".

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-03-03 11:13:38 -05:00
Daniel J Walsh e8b6b7cfd1 Merge pull request #76 from rhatdan/vendor
Bump to v0.4.2
2020-02-25 06:25:48 -05:00
Daniel J Walsh 910ac95f7a Move to v0.4.3-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-25 07:13:05 -04:00
Daniel J Walsh e261997afd Bump to v0.4.2
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-02-25 07:12:42 -04:00