2a2476fcfd
Omit apparmor_parser warnings when parsing the version
...
The `execAAParser()` function also takes `stderr` into account when
parsing the output. This function is right now only called by the
`getAAParserVersion()` function. Depending on the system configuration,
it might be possible that `apparmor_parser` prints a warning, for
example if `/etc/apparmor/parser.conf` does not exist on the system. To
thake this input not into account for the version parsing, we now just
use `stdout` as the returned result.
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-08-17 09:49:58 +02:00
9ff4a958dd
Support different zoneinfo locations
...
Some distributions have their zone information not in
`/usr/share/zoneinfo` but in `/etc/zoneinfo`. We now allow the package
to work on those distributions as well by looking in both paths for the
timezone data.
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-08-17 09:37:59 +02:00
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
7de673215b
Merge pull request #254 from rhatdan/master
...
Bump to v0.19.0
2020-08-13 09:47:02 -04:00
c2855288f1
Move to v0.19.1-dev
...
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-13 09:46:16 -04:00
c1e4a55681
Bump to v0.19.0
...
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-13 09:46:16 -04:00
165440934a
Merge pull request #250 from rhatdan/VENDOR
...
Vendor in containers/storage v1.23.0
2020-08-13 12:40:09 +02:00
48dee6d69d
Merge pull request #251 from rhatdan/codeverity
...
Fix duplicated code found by codeverity.
2020-08-13 12:32:07 +02:00
56b43d1a77
Vendor in containers/storage v1.23.0
...
Also drop runc version back to v1.0.0-rc91 since rc92 is
causing breakage in runtime-tools
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-13 06:26:21 -04:00
276ce73e39
Fix duplicated code found by codeverity.
...
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-12 10:55:46 -04:00
e54f8d8afe
Merge pull request #249 from rhatdan/caps
...
Export NormalizeCapabilities function
2020-08-10 09:16:40 -04:00
ed9aec43d0
Merge pull request #248 from davidscherer/davidscherer-xdg-config-home
...
Respect XDG_CONFIG_HOME for policy.json and cni
2020-08-10 08:50:26 -04:00
bfada097cc
Export NormalizeCapabilities function
...
We need access to this function in Podman to translate
user entry into standardized format.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-10 08:47:58 -04:00
7b48d849b7
Use homedir.GetConfigHome()
...
Signed-off-by: David Scherer <david.scherer@antithesis.com>
2020-08-09 10:31:14 -04:00
3ce09ba75f
Respect XDG_CONFIG_HOME for policy.json and cni
...
Use XDG_CONFIG_HOME if it is defined.
XDG_CONFIG_HOME is already respected for configuration files such as containers.conf, storage.conf, and registry.conf but here `~/.config` was hardcoded.
Signed-off-by: David Scherer <david.scherer@antithesis.com>
2020-08-08 13:53:58 -04:00
3da9d0a701
Merge pull request #247 from containers/dependabot/go_modules/github.com/containers/storage-1.22.0
...
Bump github.com/containers/storage from 1.21.2 to 1.22.0
2020-08-07 10:30:37 -04:00
5bff93bcd2
Bump github.com/containers/storage from 1.21.2 to 1.22.0
...
Bumps [github.com/containers/storage](https://github.com/containers/storage ) from 1.21.2 to 1.22.0.
- [Release notes](https://github.com/containers/storage/releases )
- [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md )
- [Commits](https://github.com/containers/storage/compare/v1.21.2...v1.22.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-07 08:15:18 -04:00
eaada4a08b
Merge pull request #245 from containers/dependabot/go_modules/github.com/opencontainers/runc-1.0.0-rc92
...
Bump github.com/opencontainers/runc from 1.0.0-rc91 to 1.0.0-rc92
2020-08-06 17:04:26 -04:00
9b62a97add
Bump github.com/opencontainers/runc from 1.0.0-rc91 to 1.0.0-rc92
...
Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc ) from 1.0.0-rc91 to 1.0.0-rc92.
- [Release notes](https://github.com/opencontainers/runc/releases )
- [Commits](https://github.com/opencontainers/runc/compare/v1.0.0-rc91...v1.0.0-rc92 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-08-06 06:10:53 -04:00
ba0b6ec352
Merge pull request #243 from ashley-cui/docs
...
Fix documentation
2020-08-04 15:02:13 +02:00
c14c2becc8
Merge pull request #244 from QiWang19/hooks-dir
...
Move testdata hooks_dir to [engine]
2020-08-04 06:02:58 -04:00
2b96072456
Move hooks_dir under [engine]
...
Move hooks_dir in test files to [engine] table.
Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-08-03 19:02:30 -04:00
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
983dca0020
Merge pull request #241 from rhatdan/docs
...
Fix documenation
2020-08-02 06:40:20 -04:00
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
c3a22a01ec
Merge pull request #239 from rhafer/libpod_warn
...
Fix deprecation warnings about libpod.conf and raise log level
2020-07-30 13:58:29 -04:00
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
09070a3571
Merge pull request #238 from rhatdan/VERSION
...
Bump to v0.18.0
2020-07-23 04:58:30 -04:00
36119455b5
Move to v0.18.1-dev
...
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-23 04:57:36 -04:00
69cbee712a
Bump to v0.18.0
...
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-23 04:57:11 -04:00
f7822ea9b1
Merge pull request #237 from QiWang19/pkg-retry
...
Move retry code to pkg/retry
2020-07-23 04:55:04 -04:00
423d28c4b7
Move retry code to pkg/etry
...
Move the retry helper functions to pkg/retry.
Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-07-22 13:15:51 -04:00
d9618d6a3e
Merge pull request #232 from containers/dependabot/go_modules/github.com/containers/storage-1.21.2
...
Bump github.com/containers/storage from 1.21.1 to 1.21.2
2020-07-22 06:31:39 -04:00
df5262a0f5
Merge pull request #233 from rhatdan/VENDOR
...
Bump to v0.17.1
2020-07-22 05:52:17 -04:00
eacd09cfce
Move to v0.17.2-dev
...
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-22 05:50:38 -04:00
26011402f9
Bump to v0.17.1
...
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-22 05:50:23 -04:00
8862672420
Bump github.com/containers/storage from 1.21.1 to 1.21.2
...
Bumps [github.com/containers/storage](https://github.com/containers/storage ) from 1.21.1 to 1.21.2.
- [Release notes](https://github.com/containers/storage/releases )
- [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md )
- [Commits](https://github.com/containers/storage/compare/v1.21.1...v1.21.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-22 05:49:02 -04:00
08e2e3dd92
Merge pull request #231 from mheon/fix_rootless_systemd
...
Ensure that rootless cgroupsv1 will select cgroupfs
2020-07-22 05:43:21 -04:00
4229e03e6d
Ensure that rootless cgroupsv1 will select cgroupfs
...
The current logic is that, if Podman was built with the systemd
build flag, we will always select systemd cgroups by default.
Then, if we detect no systemd dbus session, we will swap to
cgroupfs. Problem: there are cases where a systemd dbus session
is available, but systemd cgroups don't work - most notably,
rootless mode on cgroups v1 systems. Special-case this so that we
will not try to force systemd mode and break rootless containers.
Fixes https://github.com/containers/podman/issues/6982
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-07-21 16:15:50 -04:00
9aab09d8b0
Merge pull request #230 from rhatdan/VERSION
...
Bump to v0.17.0
2020-07-21 10:40:41 -04:00
19ce5b9568
Move to v0.17.1-dev
...
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-21 10:39:45 -04:00
186496d51e
Bump to v0.17.0
...
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-21 10:39:24 -04:00
48e278b7e7
Merge pull request #229 from QiWang19/retry-helpers
...
Add retry helper functions
2020-07-21 10:38:19 -04:00
988b089a30
Merge pull request #221 from giuseppe/permit-rootless-cni
...
rootless: permit custom configuration for cni
2020-07-21 11:46:04 +02:00
4f2aabb28e
Add retry helper functions
...
Add retry functions to retry on some commands and can be shared by Skopeo, Podman.
Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-07-20 18:14:40 -04:00
c230858962
Merge pull request #228 from rhatdan/VERSION
...
Remove extra lock in Reload function
2020-07-20 13:06:01 +02:00
b6bb9b862f
Remove extra lock in Reload function
...
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-19 07:13:12 -04:00
ca4af3dc38
Merge pull request #225 from rhatdan/VERSION
...
Bump to v0.16.0
2020-07-15 20:46:05 -04:00
8ea4399afe
Move to v0.16.1-dev
...
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-15 20:44:45 -04:00
dc4ee7b197
Bump to v0.16.0
...
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-15 20:44:19 -04:00
Sascha Grunert
Daniel J Walsh
OpenShift Merge Robot
Matthew Heon
David Scherer
dependabot-preview[bot]
Valentin Rothberg
Qi Wang
Ashley Cui
Tom Sweeney
Ralf Haferkamp
Giuseppe Scrivano