Commit graph

12986 commits

Author SHA1 Message Date
OpenShift Merge Robot 7a748f028c
Merge pull request #11762 from edsantiago/bats
System tests: speed up. They've gotten too slow.
2021-09-28 09:02:14 -04:00
OpenShift Merge Robot f2ffb96eb3
Merge pull request #11737 from vrothberg/fix-11472
image prune: support removing external containers
2021-09-28 07:34:12 -04:00
Valentin Rothberg a9a54eefab image prune: support removing external containers
Support removing external containers (e.g., build containers) during
image prune.

Fixes: #11472
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-09-28 10:24:16 +02:00
Ed Santiago 86083c580b System tests: speed up. They've gotten too slow.
- logs: remove unnecessary sleeps. This saves ~25s.
   Unfortunately, journald seems to have some sort of lag,
   so we need to keep retrying until we get the 'after' string.

 - ps: add placeholder test for once buildah 3544 is fixed

 - cp: bulk-kill containers when finished, instead of one by one.
   This is a big change and only saves about 8s per run, but hey.

 - mount,pause,healthcheck: 'podman stop -t 0' before rm'ing containers.
   Easy 50s.
   Have I mentioned, lately, that 'podman rm -f' needs a '-t 0' flag?

 - play: same, and also 'podman pod stop'. Seems to shave ~20s.

 - socket-activation: UGH! Buggy and useless tests! They were
   running "sleep 90" containers for no reason whatsoever. I
   assume the intention was to run them with "-d", so that's
   what I've done here. Also fixed some language. 180 seconds!

(Unrelated: cleanup in 070-build, use $IMAGE, not alpine)

Signed-off-by: Ed Santiago <santiago@redhat.com>
2021-09-27 20:06:18 -06:00
OpenShift Merge Robot 340166876e
Merge pull request #11759 from jedieaston/msi-fix
Set MSI to be 64-bit only.
2021-09-27 15:35:58 -04:00
OpenShift Merge Robot 2fabd44fe5
Merge pull request #11756 from Luap99/network-prune
CNI: network remove do not error for ENOENT
2021-09-27 15:23:57 -04:00
OpenShift Merge Robot 739359d899
Merge pull request #11702 from cevich/gitlab_runner_test
Cirrus: Add gitlab podman runner test
2021-09-27 15:02:57 -04:00
Easton Pillay 87559b0209 Set MSI to be 64-bit only.
Hi there! I noticed that the MSI file built for Windows was building in 32-bit mode, even though Podman is 64-bit only. I added a flag to wixl in the Makefile to tell it to build a 64-bit MSI, and I adjusted the podman.wxs file to use the right settings for 64-bit programs.

Signed-off-by: GitHub <noreply@github.com>
2021-09-27 17:45:50 +00:00
Paul Holzinger ca3c08bf9c
fix podman network prune integration test flakes
The podman integration tests run in parallel. Because all tests use the
same CNI config dir the podman network prune test will remove networks
which are used by other tests at the moment and thus creating
unexpected flakes.

The solution use an extra cni config dir for the network prune test.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2021-09-27 18:23:21 +02:00
OpenShift Merge Robot b60cff8cf8
Merge pull request #11754 from flouthoc/podman-stop-report-non-running
stop: Do nothing if container was never created in runtime or in a invalid state.
2021-09-27 11:58:59 -04:00
OpenShift Merge Robot 899d5d7d7c
Merge pull request #11755 from nalind/remote-build-eval-contextdir
remote build: EvalSymlinks() the context directory
2021-09-27 11:12:57 -04:00
Chris Evich f76fa3475d
Cirrus: Add gitlab podman runner test
Add execution of the downstream gitlab-runner tests using
rootless podman through the magic of socket-level
docker compatibility.  Include a comment suggesting how
to temporarily disable the test in case it fails beyond
podman code scope.

Signed-off-by: Chris Evich <cevich@redhat.com>
2021-09-27 10:37:31 -04:00
Paul Holzinger 1df0646b01
CNI: network remove do not error for ENOENT
Make podman network rm more robust by checking for ENOENT if we cannot
remove the config file. If it does not exists there is no reason to
error. This is especially useful for podman network prune.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2021-09-27 16:08:30 +02:00
Nalin Dahyabhai 464fec260c remote build: EvalSymlinks() the context directory
Use EvalSymlinks() to find the context directory, in case there's
shenanigans.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2021-09-27 09:27:06 -04:00
Aditya Rajan 8fca626e33
stop: Do nothing if container was never created in runtime
Following commit ensures we silently return container id on `stop` if
container was never created in OCI runtime.

Following behaviour ensures that we are in parity with docker.

Signed-off-by: Aditya Rajan <arajan@redhat.com>
2021-09-27 17:27:15 +05:30
OpenShift Merge Robot e27470ba97
Merge pull request #11753 from vrothberg/VENDOR
Vendor in containers/common v0.46.0
2021-09-27 07:20:14 -04:00
OpenShift Merge Robot 869cb9a654
Merge pull request #11752 from Luap99/machine-no-userns
podman machine: do not join userns
2021-09-27 05:43:10 -04:00
Ashley Cui 3600054d13 Allow machine options to be set from containers.conf
CPUS, memory, disk size, and image path defaults can be set from
[machine] table in containers.conf

[NO TESTS NEEDED]

Signed-off-by: Ashley Cui <acui@redhat.com>
2021-09-27 11:36:41 +02:00
Daniel J Walsh 5a2ca77b9b Vendor in containers/common v0.46.0
Fixes: https://github.com/containers/podman/issues/11745

[NO TESTS NEEDED] Since this is just a revendor and a one line
change for the revendor

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-09-27 11:30:09 +02:00
Paul Holzinger c668ca8597
podman machine: do not join userns
The go logic already prevents podman from joining the userns for machine
commands but the c shortcut code did not.

[NO TESTS NEEDED]

Fixes #11731

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2021-09-27 10:18:23 +02:00
OpenShift Merge Robot e19a09c3df
Merge pull request #11609 from sankalp-r/add-healthcheck-ps
added healthcheck to ps command
2021-09-24 16:51:28 -04:00
OpenShift Merge Robot 5b88e8ba82
Merge pull request #11736 from jelly/doc_search_api
[CI:DOCS] Document missing /images/search query parameters
2021-09-24 16:26:32 -04:00
OpenShift Merge Robot cd28f5783a
Merge pull request #11709 from afbjorklund/machine-json
Add JSON version of the machine list
2021-09-24 14:24:55 -04:00
OpenShift Merge Robot 85d9b37051
Merge pull request #11738 from rhatdan/docs
Fix english on prune prompt
2021-09-24 12:14:54 -04:00
Sankalp Rangare 1e0039a839 added healthcheck to ps command
Signed-off-by: Sankalp Rangare <sankalprangare786@gmail.com>
2021-09-24 20:24:23 +05:30
Daniel J Walsh a97551eb20
Fix english on prune prompt
Google docs found this while writing Podman in Action book.

[NO TESTS NEEDED]

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-09-24 09:29:08 -04:00
OpenShift Merge Robot 9c48947c73
Merge pull request #11733 from Luap99/xdg
rootful: do not set XDG_RUNTIME_DIR for cni plugins
2021-09-24 08:20:54 -04:00
Jelle van der Waa 3d8dec982f Document missing /images/search query parameters
Include the tlsVerify, listTags query parameters for the compat and
libpod endpoint and document the default value for the amount of results
which are returned.

Signed-off-by: Jelle van der Waa <jvanderwaa@redhat.com>
2021-09-24 12:27:55 +02:00
Paul Holzinger 6095c4fac0
rootful: do not set XDG_RUNTIME_DIR for cni plugins
The dnsname plugin tries to use XDG_RUNTIME_DIR to store files.
podman run will have XDG_RUNTIME_DIR set and thus the cni plugin can use
it. The problem is that XDG_RUNTIME_DIR is unset for the conmon process
for rootful users. This causes issues since the cleanup process is spawned
by conmon and thus not have XDG_RUNTIME_DIR set to same value as podman run.

Because of it dnsname will not find the config files and cannot correctly
cleanup.
To fix this we should also unset XDG_RUNTIME_DIR for the cni plugins as
rootful.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2021-09-24 11:25:02 +02:00
Paul Holzinger 1cf66f514f
Revert "rootful: unset XDG_RUNTIME_DIR"
This reverts commit 91e21bed48.

XDG_RUNTIME_DIR is required for the authfile path. We cannot unset it.

[NO TESTS NEEDED]

Fixes #11725

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2021-09-24 10:57:40 +02:00
Anders F Björklund ba46613a6c Add completion for machine list format
[NO TESTS NEEDED]

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
2021-09-23 20:31:57 +02:00
OpenShift Merge Robot 800d594afa
Merge pull request #11675 from baude/playkubebuildcontextdir
Set context dir for play kube build
2021-09-23 13:42:42 -04:00
OpenShift Merge Robot f690f78c65
Merge pull request #11716 from dilyanpalauzov/makefile_go_ldflags
Makefile: use -ldflags/-gccgoflags depending on the go implemenatiton
2021-09-23 12:17:42 -04:00
OpenShift Merge Robot e8fc990aad
Merge pull request #11654 from Luap99/health-docker
podman inspect add State.Health field for docker compat
2021-09-23 11:34:42 -04:00
OpenShift Merge Robot c2beea6958
Merge pull request #11721 from Luap99/image-completion
shell completion: do not show images without tag
2021-09-23 10:51:44 -04:00
Brent Baude 2df0685cbe Set context dir for play kube build
When performing an image build with play kube, we need to set the
context directory so things like file copies have the correct input
path.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2021-09-23 09:49:57 -05:00
Дилян Палаузов ce080d25cd Makefile: use -ldflags/-gccgoflags depending on the go implemenatiton
Insisting on “DCO” imposes formalities, that serve self-purpose.  One cannot
assume that the submitter has time or will to read texts about symbolism in
software contributions.  If the system wants to see the text

  nrEAUIEUAIe eanuitdnuae EAIUEAUIAIE »ℓ§444.3.72b)°»°ℓ§euaieauuae

in each commit, people will write this, or any other text, that the system wants to
see.  All such text, which presence is mandated by the system, has the same value.

Signed-off-by: Дилян Палаузов <git-dpa@aegee.org>
2021-09-23 16:38:04 +02:00
OpenShift Merge Robot 6b8371b1a3
Merge pull request #11722 from nalind/build-platform-docs
[CI:DOCS] update docs for --platform in podman-build.1
2021-09-23 10:15:43 -04:00
OpenShift Merge Robot b08acdbc6b
Merge pull request #11714 from vrothberg/save-remove-signatures
podman save: enforce signature removal
2021-09-23 09:38:25 -04:00
Nalin Dahyabhai 82818caffe Update docs for --platform in podman-build.1
Update the descriptions of the --arch, --os, --variant, and --platform
options, since the last of those hasn't been a no-op for some time, and
it was recently extended to accept multiple values.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2021-09-23 09:24:18 -04:00
Paul Holzinger b6e5a4909a
shell completion: do not show images without tag
The shell completion should only suggest arguments that work. Using a
image without tag does not work in many cases. Having both the version
with and without tag also forces users to press one key more because
tab completion will always stop at the colon.

Fixes #11673

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2021-09-23 15:15:35 +02:00
Paul Holzinger 1199733754
podman inspect add State.Health field for docker compat
podman inspect shows the healthcheck status in `.State.Healthcheck`,
docker uses `.State.Health`. To make sure docker scripts work we
should add the `Health` key. Because we do not want to display both keys
by default we only use the new `Health` key. This is a breaking change
for podman users but matches what docker does. To provide some form of
compatibility users can still use `--format {{.State.Healthcheck}}`. IT
is just not shown by default.

Fixes #11645

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2021-09-23 14:44:34 +02:00
OpenShift Merge Robot 3d34d3a186
Merge pull request #11647 from EduardoVega/11491-U-suffix-mount-option
Add support for :U flag with --mount option
2021-09-23 08:32:24 -04:00
OpenShift Merge Robot 5764693613
Merge pull request #11174 from TomSweeneyRedHat/dev/tsweeney/docpodimage
[CI:DOCS] Add link to running ctrimage on enablesysadm
2021-09-23 08:01:25 -04:00
Valentin Rothberg 01bf8a6687 podman save: enforce signature removal
Enforce the removal of signatures in `podman save` to restore behavior
prior to the migration to libimage.  We may consider improving on that
in the future.  For details, please refer to the excellent summary by
@mtrmac [1].

[NO TESTS NEEDED] - manually verified but exisiting tests need some
further investigation (see [1]).

[1] https://github.com/containers/podman/pull/11669#issuecomment-925250264

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-09-23 13:50:49 +02:00
OpenShift Merge Robot b0d1c0fe22
Merge pull request #11704 from rhatdan/kube
podman generate kube should not include images command
2021-09-23 04:27:26 -04:00
Anders F Björklund 4ecaf85d96 Add JSON version of the machine list
[NO TESTS NEEDED]

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
2021-09-23 07:30:27 +02:00
OpenShift Merge Robot 1dba601b56
Merge pull request #11691 from afbjorklund/machine-list
Add more information about the VM to podman machine list
2021-09-22 18:47:48 -04:00
OpenShift Merge Robot 626df0a54e
Merge pull request #11604 from rhatdan/deleteContainer
Ignore mount errors except ErrContainerUnknown when cleaningup container
2021-09-22 18:45:48 -04:00
OpenShift Merge Robot f342784ce5
Merge pull request #11701 from ashley-cui/stream
Fix machine image
2021-09-22 18:44:47 -04:00