Commit Graph

8253 Commits

Author SHA1 Message Date
OpenShift Merge Robot 78ad57ebd3
Merge pull request #6636 from mheon/add_warnings
Re-add resource limit warnings to Specgen
2020-06-17 16:51:51 +02:00
OpenShift Merge Robot 200afe7a94
Merge pull request #6583 from mheon/inspect_ctr_before_img
Fix podman inspect on overlapping/missing objects
2020-06-17 16:27:15 +02:00
OpenShift Merge Robot 38391ed25f
Merge pull request #6622 from goochjj/podman_fix_init
Fix --init and --init-path
2020-06-17 15:42:30 +02:00
OpenShift Merge Robot 4fb0f56063
Merge pull request #6638 from jwhonce/issues/6548
[CI:DOCS] Fixes #6548
2020-06-17 11:20:51 +02:00
OpenShift Merge Robot 4b2da3ed55
Merge pull request #6633 from rhatdan/VENDOR
Vendor containers/common v0.14.0
2020-06-17 08:35:04 +02:00
OpenShift Merge Robot e4e10dfc3e
Merge pull request #6635 from rhatdan/logs
Add <return> to lines returned in podman-remote logs
2020-06-17 01:14:00 +02:00
Jhon Honce 64d3508a94 [CI:DOCS] Fixes #6548
* Update swagger documentation

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-06-16 15:57:38 -07:00
Matthew Heon c51c593ff6 Re-add resource limit warnings to Specgen
These were part of Podman v1.9, but were lost in the transition
to using Specgen to create containers. Most resource limits are
checked via the sysinfo package to ensure they are safe to use
(the cgroup is mounted, kernel support is present, etc) and
removed if not safe. Further, bounds checks are performed to
ensure that values are valid.

Ensure these warnings are printed client-side when they occur.
This part is a little bit gross, as it happens in pkg/infra and
not cmd/podman, which is largely down to how we implemented
`podman run` - all the work is done in pkg/infra and it returns
only once the container has exited, and we need warnings to print
*before* the container runs. The solution here, while inelegant,
avoid the need to extensively refactor our handling of run.

Should fix blkio-limit warnings that were identified by the FCOS
test suite.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-06-16 17:32:01 -04:00
Daniel J Walsh e67dd9ffab
Add <return> to lines returen in podman-remote logs
Every line is sent back individually over the APIv2 as
logs, but we are not adding the '\n' to give us line breaks.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-06-16 17:21:43 -04:00
OpenShift Merge Robot 89630adbc4
Merge pull request #6624 from rhatdan/mount
Fix podman-remote images
2020-06-16 23:02:41 +02:00
Daniel J Walsh 713287ce36
Vendor containers/common v0.14.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-06-16 16:44:55 -04:00
Matthew Heon 6589d75565 Fix podman inspect on overlapping/missing objects
This started as a small fix to `podman inspect` where a container
and image, with the same name/tag, were present, and
`podman inspect` was run on that name. `podman inspect` in 1.9
(and `docker inspect`) will give you the container; in v2.0, we
gave the image. This was an easy fix (just reorder how we check
for image/container).

Unfortunately, in the process of testing this fix, I determined
that we regressed in a different area. When you run inspect on
a number of containers, some of which do not exist,
`podman inspect` should return an array of inspect results for
the objects that exist, then print a number of errors, one for
each object that could not be found. We were bailing after the
first error, and not printing output for the containers that
succeeded. (For reference, this applied to images as well). This
required a much more substantial set of changes to properly
handle - signatures for the inspect functions in ContainerEngine
and ImageEngine, plus the implementations of these interfaces,
plus the actual inspect frontend code needed to be adjusted to
use this.

Fixes #6556

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-06-16 14:33:33 -04:00
OpenShift Merge Robot d6965da26d
Merge pull request #6616 from containers/dependabot/go_modules/github.com/containers/conmon-2.0.18incompatible
Bump github.com/containers/conmon from 2.0.17+incompatible to 2.0.18+incompatible
2020-06-16 19:40:37 +02:00
Joseph Gooch eb8bfdad3e Fix --init and --init-path
Init properly passed into specgen
Allow --init with --systemd=true but not --systemd=always.

Signed-off-by: Joseph Gooch <mrwizard@dok.org>
2020-06-16 17:37:39 +00:00
Daniel J Walsh fb4148bc41
Fix podman-remote images
Looks like we went too far with the linters.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-06-16 12:29:25 -04:00
OpenShift Merge Robot 908bc3fba3
Merge pull request #6619 from mheon/revert_systemd_varlinkchange
[CI:DOCS] Revert "Change Varlink systemd unit to use `system service`"
2020-06-16 17:29:41 +02:00
OpenShift Merge Robot 66b6697d0e
Merge pull request #6610 from jwhonce/wip/varlink
Add deprecated message to varlink command
2020-06-16 17:12:47 +02:00
Matthew Heon 20345b1ec0 Revert "Change Varlink systemd unit to use `system service`"
This reverts commit 1bc992bfc3.

We originally thought `podman varlink` was entirely removed, but
that was not true. We originally thought that
`podman system service --varlink` worked the same as
`podman varlink` but that was also not true. `system service` is
broken when used under systemd units, and `podman varlink` still
exists and works. Revert the change to `podman system service` to
fix socket-activated Varlink under systemd.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-06-16 11:09:48 -04:00
OpenShift Merge Robot 0968f25988
Merge pull request #6615 from vrothberg/auto-update-variant
auto-update: use image's arch
2020-06-16 16:08:58 +02:00
dependabot-preview[bot] 51febc510a
Bump github.com/containers/conmon
Bumps [github.com/containers/conmon](https://github.com/containers/conmon) from 2.0.17+incompatible to 2.0.18+incompatible.
- [Release notes](https://github.com/containers/conmon/releases)
- [Changelog](https://github.com/containers/conmon/blob/master/changelog.txt)
- [Commits](https://github.com/containers/conmon/compare/v2.0.17...v2.0.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-06-16 06:37:43 -04:00
OpenShift Merge Robot e0dd227912
Merge pull request #6605 from ypu/apiv2-pods
APIv2 tests: Add some tests for podman pods
2020-06-16 05:26:07 -04:00
Valentin Rothberg af3c4d88b4 handlers/compat: fix lint error
Fix a lint error of an used parameter.  The error must have sneaked in
with a PR that was merged after the recent linter enablement.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-06-16 11:11:53 +02:00
Valentin Rothberg 2a565f49c2 auto-update: use image's arch
Use the architecture of the local image when looking for a new image on
a registry.  It seems to be common practice on ARM to tweak the
architecture choice to pull the correct image.

Fixes: #6613
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-06-16 10:52:13 +02:00
Yiqiao Pu d072de6efc APIv2 tests: Add some tests for podman pods
Add some tests for podman pods subcommand:
  restart
  rm
  start
  stas
  stop
  top
  unpause

Signed-off-by: Yiqiao Pu <ypu@redhat.com>
2020-06-16 11:53:48 +08:00
Jhon Honce 2e22e18afb Add deprecated message to varlink command
* Remove varlink references from the man pages
* Fix signature for extractTarFile()

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-06-15 11:41:57 -07:00
OpenShift Merge Robot 2c7b39ddb8
Merge pull request #6589 from rhatdan/attach
Handle errors on attach properly
2020-06-15 14:11:00 -04:00
OpenShift Merge Robot 8a42a32c71
Merge pull request #6591 from jgallucci32/patch-1
Merged request to fix -f to stop following logs
2020-06-15 13:57:13 -04:00
OpenShift Merge Robot 5a82a559c6
Merge pull request #6601 from zhangguanzhang/podman-cp-dir
fix podman cp can create an extra directory when the source is the container's root directory
2020-06-15 13:20:35 -04:00
OpenShift Merge Robot 6e0cf67874
Merge pull request #6590 from zhangguanzhang/master
Add the missing return in the API handlers' image_build method
2020-06-15 13:17:41 -04:00
OpenShift Merge Robot 2716234af3
Merge pull request #6603 from sujil02/python-test
Adds more docker py test
2020-06-15 13:11:24 -04:00
OpenShift Merge Robot b005465cb0
Merge pull request #6597 from rhatdan/image
Add some additional fields to imageinspect
2020-06-15 13:08:28 -04:00
OpenShift Merge Robot 10c6c806ea
Merge pull request #6553 from vrothberg/replace
--replace for containers and pods
2020-06-15 12:54:36 -04:00
Daniel J Walsh b2792dd76a
Handle errors on attach properly
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-06-15 12:37:17 -04:00
OpenShift Merge Robot b89729778c
Merge pull request #6609 from mheon/bump-2.0.0-rc6
Bump to v2.0.0-RC6
2020-06-15 12:04:07 -04:00
zhangguanzhang 9d293bd2de fix podman cp can create an extra directory level
Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
2020-06-15 23:56:45 +08:00
jgallucci32 6d9863e773 Remove redundant break in for loop.
Remove redundant `break` call in for loop.

Co-authored-by: Qi Wang <qiwan@redhat.com>
Signed-off-by: jgallucci32 <john.gallucci.iv@gmail.com>
2020-06-15 07:42:05 -07:00
OpenShift Merge Robot 298d622a0c
Merge pull request #6607 from containers/dependabot/go_modules/github.com/onsi/ginkgo-1.13.0
Bump github.com/onsi/ginkgo from 1.12.3 to 1.13.0
2020-06-15 10:39:58 -04:00
OpenShift Merge Robot 4fe573edfc
Merge pull request #6606 from containers/dependabot/go_modules/github.com/uber/jaeger-client-go-2.24.0incompatible
Bump github.com/uber/jaeger-client-go from 2.23.1+incompatible to 2.24.0+incompatible
2020-06-15 10:36:44 -04:00
OpenShift Merge Robot 230cd2525f
Merge pull request #6599 from afbjorklund/server-built
The string field of Built was missing from server
2020-06-15 09:59:46 -04:00
Matthew Heon c3c2faf3da Bump to v2.0.0-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-06-15 09:59:34 -04:00
Matthew Heon e74e84aa06 Bump to v2.0.0-rc6
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-06-15 09:59:31 -04:00
Valentin Rothberg 6118ab4948 generate systemd: `--replace` on named containers/pods
Use `--replace` for named containers and pods.  This will clean up
previous containers and podsthat may not have been removed after a
system crash.

Fixes: #5485
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-06-15 15:56:02 +02:00
Valentin Rothberg fe488b5f11 pod create --replace
Add a `--replace` flag to the `pod create` command.  If another pod with
the same name already exists, it will be replaced and removed.

Adding this flag is motivated by #5485 to make running Podman in systemd
units (or any other scripts/automation) more robust.  In case of a
crash, a pod may not be removed by a sytemd unit anymore.  The
`--replace` flag allows for supporting crashes.

Note that the `--replace` flag does not require the `--name` flag to be
set, so it can be set unconditionally in `podman generate systemd`.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-06-15 15:55:55 +02:00
OpenShift Merge Robot 5a6a3f81a4
Merge pull request #6608 from mheon/fix_varlink_unit
[CI:DOCS] Change Varlink systemd unit to use `system service`
2020-06-15 09:54:53 -04:00
Valentin Rothberg fa3b8a75c4 {create,run} --replace
Add a `--replace` flag to the `container {create,run}` commands.
If another container with the same name already exists, it will
be replaced and removed.

Adding this flag is motivated by #5485 to make running Podman in systemd
units (or any other scripts/automation) more robust.  In case of a
crash, a container may not be removed by a sytemd unit anymore.  The
`--replace` flag allows for supporting crashes.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-06-15 15:53:51 +02:00
Matthew Heon 1bc992bfc3 Change Varlink systemd unit to use `system service`
We completely removed `podman varlink`, which broke the systemd
unit file used by the Varlink code. Change that to use the new
`podman system service --varlink` command which replaced it.

Also needs a slight reorder of args to make things work happily
on my system.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-06-15 09:22:45 -04:00
OpenShift Merge Robot f4c3b718eb
Merge pull request #6557 from rhatdan/lint
Turn on More linters
2020-06-15 09:19:40 -04:00
dependabot-preview[bot] ea75042fb3
Bump github.com/uber/jaeger-client-go
Bumps [github.com/uber/jaeger-client-go](https://github.com/uber/jaeger-client-go) from 2.23.1+incompatible to 2.24.0+incompatible.
- [Release notes](https://github.com/uber/jaeger-client-go/releases)
- [Changelog](https://github.com/jaegertracing/jaeger-client-go/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uber/jaeger-client-go/compare/v2.23.1...v2.24.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-06-15 08:36:04 -04:00
dependabot-preview[bot] 68eca3c19e
Bump github.com/onsi/ginkgo from 1.12.3 to 1.13.0
Bumps [github.com/onsi/ginkgo](https://github.com/onsi/ginkgo) from 1.12.3 to 1.13.0.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/ginkgo/compare/v1.12.3...v1.13.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-06-15 08:35:25 -04:00
OpenShift Merge Robot e94e3fd2e8
Merge pull request #6588 from rhatdan/filters
Reassemble filters on the server side
2020-06-15 08:22:34 -04:00