12527 Commits

Author SHA1 Message Date
8b52204baa vendor containers/common@7482cf851d
Make sure that image events are written *after* execution.

Fixes: #10812
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-06-30 13:08:42 +02:00
5ebd277aa8 Merge pull request #10749 from TomSweeneyRedHat/dev/tsweeney/cni2.2.1_doc
Add CNI rootless networking troubleshooting for v2.2.1
2021-06-30 05:34:22 -04:00
78a3605018 Merge pull request #10789 from flouthoc/system-reset-prune-external
reset: remove external containers on podman system reset
2021-06-30 05:33:21 -04:00
0d8d805a76 Merge pull request #10761 from containers/dependabot/go_modules/github.com/containers/storage-1.32.4
Bump github.com/containers/storage from 1.32.3 to 1.32.4
2021-06-30 05:30:22 -04:00
4dc87c2a3a Merge pull request #10821 from jwhonce/wip/connection
Enhance system connection add URL input
2021-06-30 05:29:20 -04:00
2243b60203 reset: remove external containers on podman system reset
[NO TESTS NEEDED]

Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2021-06-30 09:04:08 +05:30
2ce78aace6 Enhance system connection add URL input
* Add support for the tcp and unix schemes in connection URLs.

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2021-06-29 16:24:03 -07:00
1846070f05 Merge pull request #10819 from ashley-cui/connls
[NO TESTS NEEDED] Make system connection ls deterministic
2021-06-29 17:07:44 -04:00
6d37e03485 Add CNI rootless networking troubleshooting for v2.2.1
A CNI container image is required for rootless networking
in V2.2.1 (RHEL 8.3.1) and through v3.0.1.  Add a note in the
troubleshooting guide with a pointer to the documenation
for that.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2021-06-29 16:54:12 -04:00
05f39af5bd Bump github.com/containers/storage from 1.32.3 to 1.32.5
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.32.3 to 1.32.5.
- [Release notes](https://github.com/containers/storage/releases)
- [Changelog](https://github.com/containers/storage/blob/main/docs/containers-storage-changes.md)
- [Commits](https://github.com/containers/storage/compare/v1.32.3...v1.32.5)

---
updated-dependencies:
- dependency-name: github.com/containers/storage
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-06-29 15:58:32 -04:00
3e8c0e00de Make system connection ls deterministic
Sort system connection ls by name, making the output deterministic. Previously, we were just iterating through a map, which caused CI flakes.

Signed-off-by: Ashley Cui <acui@redhat.com>
2021-06-29 14:57:11 -04:00
793063e086 Merge pull request #10811 from containers/dependabot/go_modules/github.com/containers/ocicrypt-1.1.2
Bump github.com/containers/ocicrypt from 1.1.1 to 1.1.2
2021-06-29 14:51:10 -04:00
599b7d746a Merge pull request #10803 from lsm5/remove-cni-conflist
Makefile: remove install.cni
2021-06-29 10:40:08 -04:00
fb5f70296b Bump github.com/containers/ocicrypt from 1.1.1 to 1.1.2
Bumps [github.com/containers/ocicrypt](https://github.com/containers/ocicrypt) from 1.1.1 to 1.1.2.
- [Release notes](https://github.com/containers/ocicrypt/releases)
- [Commits](https://github.com/containers/ocicrypt/compare/v1.1.1...v1.1.2)

---
updated-dependencies:
- dependency-name: github.com/containers/ocicrypt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-29 12:30:56 +00:00
c260cbd29d Merge pull request #10786 from tobwen/tobwen-ETCDIR
[NO TEST NEEDED] prefix `ETCDIR` with `${PREFIX}/`
2021-06-28 15:00:40 -04:00
1edada477d Makefile: remove install.cni
We no longer need to install /etc/cni/net.d/87-podman-bridge.conflist
so install.cni isn't needed either.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2021-06-28 14:52:23 -04:00
3d0e08f04e prefix ETCDIR with ${PREFIX}/
`ETCDIR` isn't prefixed and led to dangling files in `DESTDIR/etc`

Signed-off-by: Tobias Wendorff <1864057+tobwen@users.noreply.github.com>
2021-06-26 09:41:59 +00:00
0a0ade3cc0 Merge pull request #10736 from trusch/feature-use-secret-config
read secret config from config file if no user data.
2021-06-25 12:45:53 -04:00
b476781701 Merge pull request #10774 from vrothberg/registries
remove `pkg/registries`
2021-06-25 08:20:38 -04:00
f95b0995e5 remove pkg/registries
Pull the trigger on the `pkg/registries` package which acted as a proxy
for `c/image/pkg/sysregistriesv2`.  Callers should be using the packages
from c/image directly, if needed at all.

Also make use of libimage's SystemContext() method which returns a copy
of a system context, further reducing the risk of unintentionally
altering global data.

[NO TESTS NEEDED]

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-06-25 09:56:21 +02:00
2d191968b5 Merge pull request #10416 from tych0/activation-drop-FDNAMES
pkg/systemd: don't require LISTEN_FDNAMES for socket activation
2021-06-25 03:27:44 -04:00
8c7ce94b81 Merge pull request #10768 from xabinapal/issue-10767
[NO TESTS NEEDED] Swap private and shared mount relabel options
2021-06-25 03:25:43 -04:00
e7507fe7cf make DriverOpts name consistent.
Signed-off-by: Tino Rusch <tino.rusch@gmail.com>
2021-06-25 08:33:15 +02:00
a7a7011961 fix: swapped volume relabel option values
Signed-off-by: Xabier Napal <xabiernapal@pm.me>
2021-06-24 22:18:25 +02:00
d1f57a07c2 Merge pull request #10771 from infiniteregrets/cli
[NO TESTS NEEDED]  Suggestions for typos/ incorrect commands for Podman CLI
2021-06-24 11:58:10 -04:00
364e8a26da pkg/systemd: don't require LISTEN_FDNAMES for socket activation
LISTEN_FDNAMES is optional, the docs for sd_listen_fds() says:

    This information is read from the $LISTEN_FDNAMES variable, which
    **may** contain a colon-separated list of names.

emphasis mine (indeed, the cited coreos code also suggests it is optional).

This actually results in bug, since the default
/contrib/systemd/system/podman.socket file doesn't set a
FileDescriptorName=. podman when run with this systemd configuration
*always* starts in unix socket mode since SocketActivated() will return
false because the name is missing.

The bug is a race with a very small window: between when podman does the
unlink() and when it re-binds the socket later in the code, requests made
during this time will fail since nothing is listening. There's another
small race when the service stops and systemd realizes it and starts
listening again.

However, small this window we managed to hit it :).

Let's fix this by ignoring LISTEN_FDNAMES. Since the code in
cmd/podman/system/service_abi.go:restService() ignores this value anyway
when setting up the socket activated stuff, there's no real loss here.

Signed-off-by: Tycho Andersen <tycho@tycho.pizza>
2021-06-24 09:01:39 -06:00
21d80faa0b Merge pull request #10760 from vrothberg/save-docs
[CI:DOCS] podman save: clarify formats and transports
2021-06-24 09:54:14 -04:00
8459592030 Merge pull request #10773 from vrothberg/mtrmac
[CI:DOCS] add @mtrmac to OWNERS
2021-06-24 09:53:11 -04:00
f29f6aafa1 Merge pull request #10772 from vrothberg/fix-cp
cp: do not allow dir->file copying
2021-06-24 09:52:11 -04:00
b39aacf329 add @mtrmac to OWNERS
With great power comes great `/lgtm`.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-06-24 14:04:15 +02:00
b1082696eb cp: do not allow dir->file copying
Fix a bug in `podman-cp` to forbid copying directories to files.
Previously, the directory was copied to the parent directory of the file
which is wrong.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-06-24 13:53:36 +02:00
ee7a9d736b [NO TESTS NEEDED] suggestions for incorrect cmds
Signed-off-by: Mehul Arora <aroram18@mcmaster.ca>
2021-06-24 17:02:09 +05:30
b56b4b5374 read secret config from config file if no user data.
feat: read secret config from config file if the user hasn't entered
explicit config values

feat: allow to specify `--driver-opts opt1=val1,opt2=val2` in the secret
create command to allow overriding the default values

fix: show driver options in `podman secret inspect`

Signed-off-by: Tino Rusch <tino.rusch@gmail.com>
2021-06-24 12:31:14 +02:00
da33fc45b6 Merge pull request #10583 from rhatdan/log
Support log_tag defaults from containers.conf
2021-06-24 05:47:10 -04:00
63626e9b58 Merge pull request #10766 from Procyhon/13062021_manpage
[CI:DOCS] Follow-up to PR 10676
2021-06-24 05:39:06 -04:00
15fbf950ed [CI:DOCS] podman save: clarify formats and transports
Mention all supports --format values and put them into the context of
supported transports.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-06-24 09:18:16 +02:00
fc34f35e3f Merge pull request #10765 from umohnani8/mtab
Create /etc/mtab with the correct ownership
2021-06-23 16:12:45 -04:00
e1a7a0efbe Merge pull request #10747 from jwhonce/wip/report
Add --format to connection list
2021-06-23 15:53:31 -04:00
d95ff1a687 Merge pull request #10756 from jmguzik/volume-prune-until-http-api
Add support for volume prune until filter to http api
2021-06-23 15:52:30 -04:00
3f3feaa015 Merge pull request #10716 from cdoern/podFlags
Podman Pod Create --cpus and --cpuset-cpus flags
2021-06-23 15:51:29 -04:00
9db534e53a [NO TESTS NEEDED] Create /etc/mtab with the correct ownership
Create the /etc and /etc/mtab directories with the
correct ownership based on what the UID and GID is
for the container. This was causing issue when starting
the infra container with userns as the /etc directory
wasn't being created with the correct ownership.

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
2021-06-23 14:46:40 -04:00
b0a3ac3578 Merge pull request #10610 from cdoern/healthCheck
Edited compat handling code for containers/json status and added python tests
2021-06-23 14:45:29 -04:00
2b850ef055 Merge pull request #10696 from cdoern/libpodStats
Podman Stats additional features
2021-06-23 14:43:30 -04:00
7d83f9b6cc [CI:DOCS] Follow-up to PR 10676
See [PR 10676](https://github.com/containers/podman/pull/10676).

Signed-off-by: Alexander Richter <67486332+Procyhon@users.noreply.github.com>
2021-06-23 20:36:20 +02:00
bbd085ad1e Podman Pod Create --cpus and --cpuset-cpus flags
Added logic and handling for two new Podman pod create Flags.

--cpus specifies the total number of cores on which the pod can execute, this
is a combination of the period and quota for the CPU.

 --cpuset-cpus is a string value which determines of these available cores,
how many we will truly execute on.

Signed-off-by: cdoern <cbdoer23@g.holycross.edu>
2021-06-23 13:47:57 -04:00
6ecdf4c389 Health Check is not handled in the compat LibpodToContainerJSON
Added parsing and handling for the healthCheck status within containers.go. Also modified tests

fixes #10457

Signed-off-by: cdoern <cbdoer23@g.holycross.edu>
2021-06-23 13:16:19 -04:00
e50e0dad90 Merge pull request #10676 from Procyhon/13062021_manpage
[CI:DOCS] UPDATE manpages with MANPAGE_SYNTAX
2021-06-23 13:09:30 -04:00
7ed18eaec6 Merge pull request #10739 from vrothberg/fix-10682
create: support images with invalid platform
2021-06-23 13:05:31 -04:00
3322ea2c68 Merge pull request #10759 from dilyanpalauzov/master
markdown/*: typos 'a image'
2021-06-23 13:01:45 -04:00
e1f700c5d1 Merge pull request #10752 from vrothberg/fix-10730
[CI:DOCS] push/pull docs: clarify supported transports
2021-06-23 13:01:30 -04:00