Commit Graph

10739 Commits

Author SHA1 Message Date
Ed Santiago
db86ea9bca podman version and --version: fix format, exit
Three unrelated fixes to version output:

  * podman version --format json: was missing a newline
  * podman version --format TEMPLATE: had too many newlines

  * podman --version: would neither display version nor exit
    if followed by a subcommand ('podman --version ps')

The first two were easy: I used my best tweezers to delicately
pluck and transfer the misplaced \n and place it where needed.

The third was a doozy of a rabbit hole. As best I can tell,
a workaround was added in root.go to override cobra's built-in
Version handling, apparently to avoid having cobra add "-v"
as an alias for "--version". As best I can tell, cobra only
does this if the "-v" shortcut is not already taken (at
least as of Nov 2019: https://github.com/spf13/cobra/pull/996 ).
Also as best I can tell that workaround is purely vestigial,
and removing it is safe. I've manually tested "-v" in podman run,
system df, and rm. I've run system tests.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-09-15 15:08:18 -06:00
OpenShift Merge Robot
2eb3339343 Merge pull request #7644 from edsantiago/bats
Fix CI breakage due to PR collision
2020-09-15 23:07:28 +02:00
Qi Wang
2fcd1d7b4d Supports import&run--signature-policy
Enables podman create, pull, run, import to use --signature-policy option. Set it as hidden flag to be consistent with other commands.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-09-15 16:09:33 -04:00
Ed Santiago
0f1d9b3bbc Fix CI breakage due to PR collision
PR #7633 disallowed "-l" (--latest) with container args.

PR #7630 made changes to the "podman wait" command. The error
message it issues is inconsistent (and incompatible) with
the one required by the new BATS --help test. Fix that.

This is entirely my fault. I was aware of #7630, and I was
careful to check the output message format, but I was not
careful enough (I trusted my eyes, not my code).

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-09-15 13:15:17 -06:00
baude
38eb7497f8 [CI:DOCS]update owners file
update owners file to reflect more active contributors.

Signed-off-by: baude <bbaude@redhat.com>
2020-09-15 14:05:46 -05:00
Jhon Honce
8a8bae8299 Refactor API version values
* API-Version header now Major.Minor to support tools parsing this
   header
 * Libpod Version updated to 2.0.0 to reflect changes in API field
   values
 * API-Version and Libpod-API-Version headers are now included in all
   results

Fixes #7327

 * Header support tested against goland 2020.2 and
    https://www.jetbrains.com/help/idea/docker.html plugin

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-09-15 11:29:45 -07:00
OpenShift Merge Robot
bec96ab034 Merge pull request #7638 from jwhonce/wip/archive
Correct HTTP methods for /containers/{id}/archive
2020-09-15 20:01:36 +02:00
OpenShift Merge Robot
e7af517914 Merge pull request #7633 from edsantiago/minus_l_with_other_args
Usability: prevent "-l" with arguments
2020-09-15 19:58:19 +02:00
OpenShift Merge Robot
46280d6aba Merge pull request #7620 from rhatdan/DOCKER_HOST
Document the connection path for podman --remote
2020-09-15 19:54:47 +02:00
Daniel J Walsh
912f952c1f Fix --systemd=always regression
The kernel will not allow you to modify existing mount flags on a volume
when bind mounting it to another place.  Since /sys/fs/cgroup/systemd is
mounted noexec on the host, it needs to be mounted with the same flags
in the rootless container.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-09-15 13:29:44 -04:00
OpenShift Merge Robot
0be5836e49 Merge pull request #7637 from vrothberg/fix-7263
events endpoint: header: do not wait for events
2020-09-15 17:19:45 +02:00
Jhon Honce
e73db4b43a Correct HTTP methods for /containers/{id}/archive
Make methods align with Docker API

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-09-15 08:11:49 -07:00
Valentin Rothberg
0b7cb2c6b2 events endpoint: header: do not wait for events
Do not wait for events to occur before writing the OK header.
Events can take an unknown amount of time to occur and clients
do not need to wait until then to know if the connection is
good.

Fixes: #7263
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-09-15 14:28:38 +02:00
Valentin Rothberg
ce6efadd5c run/create: record raw image
Record the user-specified "raw" image name in the SpecGenerator, so we
can pass it along to the config when creating a container.  We need a
separate field as the image name in the generator may be set to the
ID of the previously pulled image - ultimately the cause of #7404.

Reverting the image name from the ID to the user input would not work
since "alpine" for pulling iterates over the search registries in the
registries.conf but looking up "alpine" normalizes to
"localhost/alpine".

Recording the raw-image name directly in the generator was the best of
the options I considered as no hidden magic from search registries or
normalizations (that may or may not change in the future) can interfere.
The auto-update backend enforces that the raw-image name is a
fully-qualified reference, so we need to worry about that in the front
end.

Fixes: #7407
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-09-15 13:33:22 +02:00
OpenShift Merge Robot
3f6045ce20 Merge pull request #7625 from vrothberg/fix-7617
move `rootless-cni-infra` image to quay.io
2020-09-15 12:21:10 +02:00
OpenShift Merge Robot
3b4ad9a81d Merge pull request #7452 from jwhonce/issues/7136
Refactor API build endpoint to be more compliant
2020-09-15 12:17:12 +02:00
OpenShift Merge Robot
d5db2af340 Merge pull request #7634 from vrothberg/vendor-image
vendor github.com/containers/image/v5@v5.6.0
2020-09-15 12:13:58 +02:00
Valentin Rothberg
155d43631e rootless CNI: extract env and cmd from image
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-09-15 10:18:30 +02:00
Valentin Rothberg
02f8acce2a libpod: rootless CNI image: use quay
Use the newly built image from quay.io.  Also reference the image by
digest.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-09-15 10:18:26 +02:00
Valentin Rothberg
d4bea54dfe move rootless-cni-infra image to quay.io
Move the `rootless-cni-infra` image to `quay.io/libpod/rootless-cni-image:$tag`
where $tag has the format `$version-$architecture`.  Whenever we upload
a new image (e.g., after changing the Containerfile), we need to make
sure to increase the version number (an ordinary integer for simplicity) so we
have a notion of support.

Thanks to @AkihiroSuda for working on rootless CNI!

Fixes: #7617
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-09-15 10:14:34 +02:00
Valentin Rothberg
ba31680272 vendor github.com/containers/image/v5@v5.6.0
No code changes as we vendored a pre-release commit.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-09-15 09:48:04 +02:00
OpenShift Merge Robot
5c47a331ba Merge pull request #7630 from Luap99/wait-n-args
podman wait accept args > 1
2020-09-14 23:09:14 -04:00
Paul Holzinger
685ef847dd podman wait accept args > 1
Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
2020-09-15 00:02:45 +02:00
Ed Santiago
2583948f72 Usability: prevent "-l" with arguments
Add new system check confirming that "podman foo -l arg"
throws an error; and fix lots of instances where code
was not doing this check.

I'll probably need to add something similar for --all but
that can wait.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-09-14 15:49:28 -06:00
Daniel J Walsh
48927f186d Document the connection path for podman --remote
Issue: GH-7010
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-09-14 17:06:24 -04:00
Jhon Honce
146c68f3ac Refactor API build endpoint to be more compliant
* Refactor/Rename channel.WriteCloser() to encapsulate the channel
* Refactor build endpoint to "live" stream buildah output channels
  over API rather then buffering output
* Refactor bindings/tunnel build because endpoint changes
  * building tar file now in bindings rather then depending on
    caller
* Cleanup initiating extra image engine
* Remove setting fields to zero values (less noise in code)
* Update tests to support remote builds

Fixes #7136
Fixes #7137

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-09-14 13:46:59 -07:00
OpenShift Merge Robot
fd7cdb2502 Merge pull request #7611 from rhatdan/completions
Fix completions for namespaces
2020-09-14 04:37:09 -04:00
OpenShift Merge Robot
b7a7cf6576 Merge pull request #7614 from mheon/bump-2.1.0-rc1
[CI:DOCS] Bump to v2.1.0-RC1
2020-09-14 03:48:42 -04:00
OpenShift Merge Robot
b7936b552f Merge pull request #7616 from EduardoVega/5845-support-for-systemd-resolved
Determine if resolv.conf points to systemd-resolved
2020-09-14 03:45:20 -04:00
Peter
c8f9117cef Fix mismatch between log messages and behavior of libpod.LabelVolumePath.
A reading of LabelVolumePath suggests that the intended behavior
upon encountering ENOTSUP is to log the issue and continue without
error, while all other errors in the Relabeling operation should
be considered errors of LabelVolumePath and passed up accordingly.

This is not the behavior that is encountered, as this test shows:
it is instead considered an error if and only if the Relabeling
operation returns ENOTSUP, spitting out a somewhat incongruous
error message, while all other error types that may be returned
are logged without being propogated, with an even more incongruous
error message saying that the operation was not supported.

The comparison was changed to match the behavior documented by the
log messages, and a test was added that will simulate executing
this function on a path where the mounted filesystem does not
support SELinux labels, with the assertion that the function should
not return an error in order to highlight the condition these
changes seek to alleviate.

Signed-off-by: Peter <peter@psanders.me>
2020-09-13 23:24:15 -04:00
OpenShift Merge Robot
3f5f99b883 Merge pull request #7619 from rhatdan/pulltype
pull types allow initial caps
2020-09-13 17:08:44 -04:00
Daniel J Walsh
81f99c3ecd pull types allow initial caps
validate pulltype will allow initial caps form cli or yaml file passed to i
play kube.

Use code related with pullpolicy from containers/common.

Signed-off-by: Qi Wang <qiwan@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-09-12 07:02:04 -04:00
Eduardo Vega
6a1233597a Determine if resolv.conf points to systemd-resolved
Signed-off-by: Eduardo Vega <edvegavalerio@gmail.com>
2020-09-11 23:31:07 -06:00
Matthew Heon
0b98ff89b7 Bump to v2.1.0-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-09-11 17:57:17 -04:00
Matthew Heon
b4717de7bc Bump to v2.1.0-rc1
Signed-off-by: Matthew Heon <mheon@redhat.com>
v2.1.0-rc1
2020-09-11 17:57:14 -04:00
OpenShift Merge Robot
25fb0c2b96 Merge pull request #7612 from mheon/release_notes_210_rc1
[CI:DOCS] Add release notes for Podman v2.1.0-RC1
2020-09-11 17:51:02 -04:00
Matthew Heon
c76ff04b0f Add release notes for Podman v2.1.0-RC1
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-09-11 16:55:42 -04:00
Daniel J Walsh
9c8bc47d8d Fix completions for namespaces
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1873650

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-09-11 15:57:21 -04:00
OpenShift Merge Robot
834c41da7d Merge pull request #7609 from rhatdan/VENDOR
Vendor in containers/buildah 1.16.1
2020-09-11 15:36:33 -04:00
Daniel J Walsh
08cc87636e Vendor in containers/buildah 1.16.1
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-09-11 13:37:37 -04:00
OpenShift Merge Robot
4f040070b6 Merge pull request #7605 from rhatdan/VENDOR
Vendor in containers/common v0.22.0
2020-09-11 12:10:39 -04:00
OpenShift Merge Robot
71787765f5 Merge pull request #7604 from vrothberg/fix-7406
system df: fix image-size calculations
2020-09-11 11:33:34 -04:00
OpenShift Merge Robot
d7db1da789 Merge pull request #7600 from rhatdan/codespell
Fix up errors found by codespell
2020-09-11 11:30:05 -04:00
OpenShift Merge Robot
881f2dfe92 Merge pull request #7403 from QiWang19/runtime-flag
Add global options --runtime-flags
2020-09-11 11:00:11 -04:00
OpenShift Merge Robot
d8a0db2e0b Merge pull request #7589 from rhatdan/rootfs
[CI:DOCS] Document --read-only --rootfs requirements
2020-09-11 10:37:15 -04:00
OpenShift Merge Robot
37658c0976 Merge pull request #7601 from vrothberg/add-ed
add @edsantiago to OWNERS file
2020-09-11 09:59:50 -04:00
Daniel J Walsh
cd2b2d9fae Vendor in containers/common v0.22.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-09-11 09:52:19 -04:00
OpenShift Merge Robot
8f0a53c974 Merge pull request #7561 from vrothberg/fix-7340
remote run: fix error checks
2020-09-11 09:36:53 -04:00
Valentin Rothberg
f867d27ae0 system df: fix image-size calculations
Fix the image-size calculations of system-df, where the shared size is
the actual shared size with other images (including children) and the
(total) size is the sum of the shared and unique size [1].

To calculate parent/child relations, make use of the recently added
layer tree which allows for quick (and cached!) calculations.

Break calculating image disk usages into the image runtime to a) access
the layer tree, and b) make the code easier to maintain and extend.

[1] https://docs.docker.com/engine/reference/commandline/system_df/

Fixes: #7406
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-09-11 14:48:56 +02:00
Valentin Rothberg
7f43624729 add @edsantiago to OWNERS file
I keep forgetting to /approve PRs as Ed really doesn't need an explicit
approval.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-09-11 12:56:02 +02:00