Commit Graph

1399 Commits

Author SHA1 Message Date
OpenShift Merge Robot 13db0f2b61
Merge pull request #6118 from baude/v2bindingsenforce
set binding tests to required
2020-05-08 17:57:10 +02:00
OpenShift Merge Robot f4e3ec5fd6
Merge pull request #6134 from vrothberg/systemd-unit-tests
fix and enable systemd system tests
2020-05-08 16:13:13 +02:00
Brent Baude 20407a2f1f fix pod stats flake
it appears that the pod stats flake can be attributed to the fact that the container being run is not fully running when the stats call is made.  because the stats call is in format of json, it fails when nil

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-05-08 09:05:37 -05:00
OpenShift Merge Robot 7c63059287
Merge pull request #6117 from vrothberg/v2-runlabel
container runlabel
2020-05-08 15:17:26 +02:00
Valentin Rothberg 42c6aa1a42 fix and enable systemd system tests
The systemd unit test never ran in CI and was broken for various
reasons.  Fix the test to execute Podman in systemd units and to also
run generated units files.

Note: more tests will be added in the future.  The simple check for now
will prevent regressions.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-05-08 13:05:25 +02:00
Valentin Rothberg ff1c59065e
Merge pull request #6130 from vrothberg/pidfile
set --conmon-pidfile
2020-05-08 13:04:59 +02:00
OpenShift Merge Robot cc6a77cc88
Merge pull request #6078 from QiWang19/auth-common
auth pkg support emtpy argument & enable login test
2020-05-08 12:54:41 +02:00
Valentin Rothberg 676efd89d5 set --conmon-pidfile
The --conmon-pidfile was not set in the spec leading to failing systemd
units.  Also add a system test to prevent future regressions.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-05-08 10:53:11 +02:00
Giuseppe Scrivano 99bdafba99
podman: split env variables in env and overrides
There are three different priorities for applying env variables:

1) environment/config file environment variables
2) image's config
3) user overrides (--env)

The third kind are known to the client, while the default config and image's
config is handled by the backend.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-05-07 14:16:50 -04:00
OpenShift Merge Robot 1d3cdf9a46
Merge pull request #5961 from QiWang19/manifest-remove-push
Manifest remove, push
2020-05-07 19:10:32 +02:00
baude e9a17da1c5 v2trust set and show
add podman image trust set and show

Signed-off-by: baude <bbaude@redhat.com>
Signed-off-by: bbaude <bbaude@DESKTOP-SH5EG3J.localdomain>
Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-05-07 09:55:52 -05:00
Valentin Rothberg 61828cf480 container runlabel
Implement container runlabel for v2.  Local client only.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-05-07 16:18:39 +02:00
Qi Wang 45f731aa49 enable login/logut unspecified args
Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-05-07 09:48:13 -04:00
Sujil02 2080421cad Enables port test
Adds port subcommand for containers
Updates check for no args when all flag is set.

Signed-off-by: Sujil02 <sushah@redhat.com>
2020-05-06 16:06:41 -04:00
OpenShift Merge Robot 8b5df5b5d9
Merge pull request #6092 from vrothberg/v2-kube
add {generate,play} kube
2020-05-06 20:34:13 +02:00
Valentin Rothberg f269be3a31 add {generate,play} kube
Add the `podman generate kube` and `podman play kube` command.  The code
has largely been copied from Podman v1 but restructured to not leak the
K8s core API into the (remote) client.

Both commands are added in the same commit to allow for enabling the
tests at the same time.

Move some exports from `cmd/podman/common` to the appropriate places in
the backend to avoid circular dependencies.

Move definitions of label annotations to `libpod/define` and set the
security-opt labels in the frontend to make kube tests pass.

Implement rest endpoints, bindings and the tunnel interface.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-05-06 17:08:22 +02:00
Qi Wang 5621f5199d Manifest remove, push
Implements podman manifest remove and podman manifest push.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-05-06 10:54:28 -04:00
Matthew Heon ad9f776c5e Reenable systemd E2E tests
All functionality these require should be ported.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-05-06 10:33:18 -04:00
OpenShift Merge Robot 0eb905ff2c
Merge pull request #6096 from mheon/fix_small_issues
Add small fixes for 'podman run' from diffing inspect
2020-05-06 11:27:05 +02:00
OpenShift Merge Robot 7885b5cd52
Merge pull request #6063 from QiWang19/manifest-annotate
manifest annotate
2020-05-06 03:41:09 +02:00
Matthew Heon f7c3cfde77 Add small fixes for 'podman run' from diffing inspect
To try and identify differences between Podman v1.9 and master,
I ran a series of `podman run` commands with various flags
through each, then inspecting the resulting containers and diffed
the inspect JSON between each. This identified a number of issues
which are fixed in this PR.

In order of discovery:
- Podman v2 gave short names for images, where Podman v1 gave the
  fully-qualified name. Simple enough fix (get image tags and use
  the first one if they're available)
- The --restart flag was not being parsed correctly when a number
  of retries was specified. Parsing has been corrected.
- The -m flag was not setting the swap limit (simple fix to set
  swap in that case if it's not explicitly set by the user)
- The --cpus flag was completely nonfunctional (wired in its
  logic)

Tests have been added for all of these to catch future
regressions.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-05-05 20:21:01 -04:00
Qi Wang 1090d4d5d9 manifest annotate
Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-05-05 15:01:32 -04:00
OpenShift Merge Robot 864aec8bb0
Merge pull request #6081 from baude/v2system
v2 system subcommand
2020-05-05 20:49:17 +02:00
baude 25312bb5b4 v2 system subcommand
add system df, info, load, renumber, and migrate

Refactor for specialized libpod engines

add the ability to prune images, volumes, containers, and pods

Signed-off-by: baude <bbaude@redhat.com>
2020-05-05 12:24:33 -05:00
OpenShift Merge Robot fb6eca50ba
Merge pull request #6088 from edsantiago/bats_check_usage
BATS help test: check usage string
2020-05-05 17:32:25 +02:00
OpenShift Merge Robot 9db97dbab8
Merge pull request #6080 from baude/v2stats
v2 podman stats
2020-05-05 17:29:56 +02:00
baude b5a235df90 v2 podman stats
Signed-off-by: baude <bbaude@redhat.com>
2020-05-05 08:46:51 -05:00
Ed Santiago 29d39e35e4 BATS help test: check usage string
Now that we've agreed that usage messages should match
what the user typed, confirm it. IOW 'podman foo --help'
should not issue a usage message for 'podman container foo'.

Fix one broken instance, 'unpause'.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-05-05 07:19:58 -06:00
Matthew Heon 7ac3d906b5 Rework port parsing to support --expose and -P
As part of this, make a major change to the type we use to
represent port mappings in SpecGen (from using existing OCICNI
structs to using our own custom one). This struct has the
advantage of supporting ranges, massively reducing traffic over
the wire for Podman commands using them (for example, the
`podman run -p 5000-6000` command will now send only one struct
instead of 1000). This struct also allows us to easily validate
which ports are in use, and which are not, which is necessary for
--expose.

Once we have parsed the ports from the new struct, we can produce
an accurate map including all currently requested ports, and use
that to determine what ports need to be exposed (some requested
exposed ports may already be included in a mapping from --publish
and will be ignored) and what open ports on the host we can map
them to.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-05-04 20:57:27 -04:00
OpenShift Merge Robot 51d0be4204
Merge pull request #6051 from rhatdan/containers.conf
Fixes for test/e2e/containers_conf_test.go
2020-05-04 11:08:43 +02:00
OpenShift Merge Robot bffd3f5134
Merge pull request #6060 from sujil02/systemprune-v2
And system prune feature for v2.
2020-05-01 21:08:50 +02:00
Daniel J Walsh 1218d70915
Remove skip on containers.conf tests
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-05-01 15:00:33 -04:00
Daniel J Walsh 730fbc7628
Properly handle containers.conf devices
We need to add the default devices listed in containers.conf

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-05-01 15:00:26 -04:00
Sujil02 b94862171b And system prune feature for v2.
Adds podman system prune for v2.
Refactoring for code reuse from pods containers images and volume prune.
Adds and enables testcases to support the added feature.

Signed-off-by: Sujil02 <sushah@redhat.com>
2020-05-01 13:57:16 -04:00
OpenShift Merge Robot 226e0da6fe
Merge pull request #6057 from baude/v2networking
v2networking enable commands
2020-05-01 18:27:16 +02:00
baude 98e71583a4 add provided cni networks to spec gen
enable final integration tests for networking.

Signed-off-by: baude <bbaude@redhat.com>
2020-05-01 09:20:52 -05:00
OpenShift Merge Robot 1230499e45
Merge pull request #6016 from giuseppe/fix-create
v2, podman: fix create and entrypoint tests
2020-05-01 15:32:00 +02:00
baude 52371057cd fix commands without input
in cases where commands require input and we dont provide it, we often would segv.  This can be attributed in many cases to the subcommand not picked up the cobra Args attribute or neither had them.

Signed-off-by: baude <bbaude@redhat.com>
2020-04-30 15:10:49 -05:00
Ed Santiago 91a42fefcb System tests: help messages: check required-arg
If a usage message is of the form '... [flags] ARGNAME',
where ARGNAME is all-caps and not in brackets, it must
be a required argument. Try running podman subcommand
without ARGNAME, and make sure that podman bails out
with an informative message. (Since this message is
freeform in each subcommand, not Cobra-generated,
we have a lot of possible variations to check for).

Fix podman login/logout Use messages to indicate that
REGISTRY is now optional (as of #5233).

This test has actually been in place for over a year but
due to a typo on my part -- a missing space -- it was
not being run. "For want of a space, much testing was lost".

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-04-30 14:55:10 -05:00
baude e88a418528 v2networking enable commands
Enable the networking commands for v2.

Signed-off-by: baude <bbaude@redhat.com>
2020-04-30 14:53:54 -05:00
Sujil02 c3c030f550 Enable prune integration test. Fixes container prune.
Fixes container prune to prune created and configured containers.
Disables couple of system prune test as not yet in with v2.

Signed-off-by: Sujil02 <sushah@redhat.com>
2020-04-30 12:03:09 -04:00
Giuseppe Scrivano aef7836b38
test: enable start tests
`docker start` doesn't resolve partial ID -> full ID, adapt test.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-30 15:49:12 +02:00
Giuseppe Scrivano 1d34977b4c
test: enable remaining run tests
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-30 11:33:37 +02:00
Giuseppe Scrivano 9c67a9c155
test: enable entrypoint tests
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-30 11:33:36 +02:00
Giuseppe Scrivano ed7a9739e4
test: enable create tests
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-30 11:33:35 +02:00
Qi Wang 75eeb40f41 testv2: enable attach test
testv2: enable attach test

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-04-29 23:47:15 -04:00
OpenShift Merge Robot 99f8cfc2dc
Merge pull request #5956 from jwhonce/wip/version
V2 restore podman -v command
2020-04-29 20:50:43 +02:00
OpenShift Merge Robot a2127efbf8
Merge pull request #6042 from baude/systemtestfinal
enable final system test
2020-04-29 20:33:40 +02:00
baude e1f1dee006 enable final system test
Signed-off-by: baude <bbaude@redhat.com>
2020-04-29 12:01:18 -05:00
Jhon Honce 6a586992c1 V2 restore podman -v command
* Removed extra spaces and improved error message
* Updated tests to use gomega matchers

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-04-29 09:15:24 -07:00
Jhon Honce a9cc13448e V2 Restore images list tests
* Fix history --quiet formatting
* Fix image inspect --format=json
* Fix image list --sort

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-04-29 08:24:56 -07:00
OpenShift Merge Robot 27aa3a7837
Merge pull request #6039 from vrothberg/enable-search-tests
Enable search tests
2020-04-29 17:04:22 +02:00
Valentin Rothberg 5ee3af2d03 enable search tests
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-04-29 16:28:18 +02:00
OpenShift Merge Robot c5a035b032
Merge pull request #6038 from giuseppe/v2-enable-copy
test: enable cp tests
2020-04-29 16:26:07 +02:00
Giuseppe Scrivano b74508fff0
test: enable cp tests
and fix them to use a distinct directory.  I've seen a test failing as
it was using the same directory as another test, that is not related
to v2 itself.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-29 15:40:31 +02:00
Valentin Rothberg 5c108f75eb login system test: enable "push ok"
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-04-29 15:23:30 +02:00
Valentin Rothberg 4177641875 enable the push e2e tests
With the recent changes, push is working now.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-04-29 14:35:48 +02:00
Ed Santiago daeb6f00b2 system tests: enable skopeo REGISTRY_AUTH_FILE
skopeo pr #829 adds REGISTRY_AUTH_FILE support; this lets us
enable the following test:

  podman login - shares credentials with skopeo - via envariable

(I seriously doubt that the CI VMs have been updated with the
new skopeo, but I can leave this PR in limbo until that happens.
Otherwise I'll forget to enable the test).

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-04-29 05:45:11 -06:00
OpenShift Merge Robot 3e912f711b
Merge pull request #6022 from vrothberg/enable-inspect-tests
enable inspect tests
2020-04-29 11:21:47 +02:00
OpenShift Merge Robot 62a4befe04
Merge pull request #5998 from vrothberg/generate-systemd
generate systemd
2020-04-29 11:19:15 +02:00
OpenShift Merge Robot 4e21d09f98
Merge pull request #6029 from rhatdan/env
User specified environment happen after other environments are set
2020-04-29 08:52:14 +02:00
Valentin Rothberg 8700c2fd03 enable inspect tests
A surprisingly big change.  A core problem was that `podman inspect`
allows for passing containers AND images with the default `--type=all`.
This only worked partially as the data was processed in isolation which
caused various issues (e.g., two separate outputs instead of one) but it
also caused issues regarding error handling.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-04-29 07:25:31 +02:00
Valentin Rothberg b2414b580e generate systemd
Implement `podman generate systemd` for Podman v2 and enable associated
tests.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-04-29 07:22:18 +02:00
OpenShift Merge Robot bf4efc1953
Merge pull request #6026 from baude/v2forcesystemtests
system tests must pass
2020-04-28 23:29:20 +02:00
OpenShift Merge Robot dcac908bbe
Merge pull request #6011 from sujil02/podman-save-issue-5234
Fixes podman save fails when specifying an image using a digest fixes-5234
2020-04-28 23:10:20 +02:00
Daniel J Walsh e84beeaf94
User specified environment happen after other environments are set
When using varlink we want to make sure that user specified environment variables
take precedence over http-proxy environment.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-28 16:29:01 -04:00
Brent Baude 517bc28360 system tests must pass
Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-28 15:17:00 -05:00
Sujil02 38eb9f4a3d Fixes podman save fails when specifying an image using a digest #5234
Adds check to parse normalized name and create docker archive dst reference
for tagged untagged image. Relevant test case added.

Signed-off-by: Sujil02 <sushah@redhat.com>
2020-04-28 16:16:30 -04:00
OpenShift Merge Robot 8f57f312d6
Merge pull request #6020 from giuseppe/fix-exec
v2, podman: fix create tests
2020-04-28 19:19:12 +02:00
Giuseppe Scrivano e8e00133c1
test: enable exec tests
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-28 15:32:59 +02:00
OpenShift Merge Robot e9a1726f50
Merge pull request #6007 from baude/v2intvolumes
enable volume integration tests
2020-04-28 15:25:16 +02:00
Valentin Rothberg 34b2ccae4c enable build tests
One test is still being skipped as container creation doesn't yet set
certain data from the image (e.g., PATH).

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-04-28 08:58:06 +02:00
Brent Baude e78e66c5b9 enable volume integration tests
enabled integration tests for volumes.  there are two exceptions that still need work because of something not yet implemented.

also, add code to deal with the fact that containers conf appears to set a local volume driver where it used to be simply blank.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-27 16:12:06 -05:00
OpenShift Merge Robot f6f7172494
Merge pull request #6000 from mheon/volume_backend_flags
Add support for volumes-from, image volumes, init
2020-04-27 21:53:37 +02:00
OpenShift Merge Robot 8642e256f2
Merge pull request #5978 from rhatdan/ports
Make podman container list == podman ps
2020-04-27 21:27:49 +02:00
OpenShift Merge Robot 733c38028d
Merge pull request #5999 from giuseppe/fix-pod-infra-container
v2, podman: fix pod tests
2020-04-27 20:37:03 +02:00
OpenShift Merge Robot ccf009d22e
Merge pull request #6001 from baude/v2intload
enable load integration tests
2020-04-27 20:34:39 +02:00
OpenShift Merge Robot e90112a58c
Merge pull request #5984 from baude/v2intrestart
enable integration tests for restart
2020-04-27 20:27:36 +02:00
OpenShift Merge Robot 5554698a44
Merge pull request #5975 from giuseppe/fix-pause-tests
[v2] tests: fix pause tests
2020-04-27 20:25:14 +02:00
Matthew Heon 02671a103f Add support for volumes-from, image volumes, init
This should complete Podmanv2's support for volume-related flags.
Most code was sourced from the old pkg/spec implementation with
modifications to account for the split between frontend flags
(volume, mount, tmpfs) and the backend flags implemented here.

Also enables tests for podman run with volumes

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-04-27 13:13:21 -04:00
Brent Baude 6db081fc5e enable load integration tests
fix bug where multiple images can be loaded and have to be able to handle the return of multiple names

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-27 10:20:53 -05:00
Giuseppe Scrivano 1803b28d8c
test: enable all pod tests
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-27 17:08:56 +02:00
OpenShift Merge Robot ca1c674d2e
Merge pull request #5966 from vrothberg/v2-pod-stats
implement pod stats
2020-04-27 16:15:09 +02:00
Brent Baude a7b3310db5 enable integration tests for restart
enable integrations tests for container restart.  fixed bug where --running was not being honored.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-27 09:08:27 -05:00
Daniel J Walsh a83d1a2772
Make podman container list == podman ps
Also make
podman create -p PUBLISHPorts
work.

This PR fixes ps_test.go

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-27 09:51:26 -04:00
OpenShift Merge Robot fdf64f0c66
Merge pull request #5994 from giuseppe/fix-healthchecks
v2, podman: fix healthchecks
2020-04-27 15:40:24 +02:00
OpenShift Merge Robot 529824ec1e
Merge pull request #5997 from giuseppe/fix-pod-create
v2, podman: fix a bunch of "podman pod *" tests
2020-04-27 15:37:58 +02:00
OpenShift Merge Robot ef46687dc5
Merge pull request #5976 from QiWang19/manifest-add-os
Add --os to manifest add
2020-04-27 15:33:00 +02:00
Giuseppe Scrivano 2fc54facf2
test: enable pod rm tests
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-27 14:02:54 +02:00
Giuseppe Scrivano 196e12f185
test: enable pod restart tests
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-27 13:41:58 +02:00
Giuseppe Scrivano 246c0053c1
test: enable pod stop tests
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-27 13:19:35 +02:00
Giuseppe Scrivano 9a633bd2f5
test: enable pod create tests
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-27 13:12:24 +02:00
Valentin Rothberg 7ee0f7e14c implement pod stats
Implement pod stats for the local and remote client. Both code paths end
up in infra/abi to allow for code share.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-04-27 12:00:35 +02:00
Giuseppe Scrivano df9450925b
test: fix check for pause on cgroup v2
There is no freezer controller in the cgroup root, use the current
cgroup to look it up.

The test was never running on cgroup v2.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-27 11:59:22 +02:00
Giuseppe Scrivano e750c13b70
test: fix pause tests
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-27 11:59:22 +02:00
OpenShift Merge Robot e88b2dc0c9
Merge pull request #5992 from sujil02/v2-pod-inspect
Enable pod inspect integration test
2020-04-27 11:58:46 +02:00
OpenShift Merge Robot 7c9a8fc93d
Merge pull request #5985 from rhatdan/test1
Enable these tests
2020-04-27 11:56:20 +02:00
OpenShift Merge Robot c2a33b7bf9
Merge pull request #5990 from baude/v2intrunns
enable run_ns integration tests
2020-04-27 11:42:10 +02:00
OpenShift Merge Robot 45932c123b
Merge pull request #5989 from baude/v2intrunrestart
enable run_restart integration tests
2020-04-27 11:39:48 +02:00
OpenShift Merge Robot 3bc6a886a0
Merge pull request #5988 from baude/v2intrunsignal
enable run_signal integration tests
2020-04-27 11:37:19 +02:00
Giuseppe Scrivano 00233e0311
test: enable healthcheck tests
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-27 11:31:47 +02:00
OpenShift Merge Robot efafd99e6d
Merge pull request #5983 from baude/v2intcontainerinspect
Enable container inspect integration tests
2020-04-27 09:42:33 +02:00
Sujil02 c1766d5e64 Enable pod inspect integration test
Enable pod inspect integration  test
Get rid of libpod pod inspect references
Remove libpod PodInspect struct.

Signed-off-by: Sujil02 <sushah@redhat.com>
2020-04-26 16:38:52 -04:00
Brent Baude 0e82dece77 enable run_restart integration tests
also, correct arg processing mistake in start

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-26 10:44:17 -05:00
Brent Baude 4d2e926a2a enable run_ns integration tests
Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-26 10:42:40 -05:00
Brent Baude a2704003ef enable run_signal integration tests
Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-26 10:34:47 -05:00
Daniel J Walsh 8552823ac1
Enable these tests
These tests are passing locally.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-26 07:27:41 -04:00
Brent Baude 56c27ea1c6 Enable container inspect integration tests
Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-25 13:36:11 -05:00
Brent Baude 942a3ef588 Enable pod ps integration tests
Enable integration tests for pod ps.

In addition, fixed bug where output was still using slice go template routines and would fail when no infra container was present.  Added integration test to prevent future regressions.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-25 13:13:32 -05:00
OpenShift Merge Robot 2afe579c06
Merge pull request #5971 from giuseppe/fix-userns-tests
v2, podman: fix and enable all run_userns_test.go tests
2020-04-24 22:39:26 +02:00
OpenShift Merge Robot 10f3a8ac6b
Merge pull request #5977 from QiWang19/commit-test
V2 tests: enables commit tests
2020-04-24 22:29:27 +02:00
Qi Wang d7a3785b3e V2 tests: enables commit tests
V2 tests enables commit tests

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-04-24 15:20:04 -04:00
Qi Wang 2f3734b143 Add --os to manifest add
Add --os to manifest add for overriding the os field.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-04-24 14:57:56 -04:00
OpenShift Merge Robot a49d5c9c2f
Merge pull request #5974 from giuseppe/fix-init
[v2] containers, init: skip invalid state errors with --all
2020-04-24 20:33:17 +02:00
OpenShift Merge Robot 3c3adac528
Merge pull request #5967 from giuseppe/run-test-fixes
v2, tests: fix various run_test.go failures
2020-04-24 17:46:20 +02:00
Giuseppe Scrivano bd7cad775a
containers, init: skip invalid state errors with --all
reintroduce the same check that exists in v1.9.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-24 17:33:27 +02:00
Giuseppe Scrivano 88f1994ab9
podman: assume user namespace if there are mappings
if some mappings are specified, assume there is a private user
namespace.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-24 15:55:38 +02:00
Giuseppe Scrivano 64d8b4eebb
podman: implement userns=keep-id
add missing implementation for userns=keep-id and enable the user
namespaces tests.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-24 15:03:50 +02:00
Giuseppe Scrivano c746980baf
test: enable cgroup parent tests
cgroups tests should pass now

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-24 13:05:43 +02:00
Giuseppe Scrivano 3eeb03d1f9
podman: fix --log-opt=path=%s
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-24 13:02:07 +02:00
Giuseppe Scrivano 145d74716c
podman: fix --http-proxy
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-24 12:56:24 +02:00
Giuseppe Scrivano a1f73d0954
podman: fix podman --group-add
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-24 12:56:23 +02:00
Giuseppe Scrivano 543d5f1740
test: fix --host-env test
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-24 12:56:22 +02:00
Giuseppe Scrivano 2e6a62fc38
podman: fix --cgroups=disabled
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-24 12:56:21 +02:00
Giuseppe Scrivano 9f8d002e1f
test: enable some run_test.go tests that pass now
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-24 12:56:21 +02:00
OpenShift Merge Robot 397dcc358a
Merge pull request #5843 from QiWang19/manifest_create
manifest create,add,inspect
2020-04-23 17:45:38 +02:00
Qi Wang 17783dda68 manifest create,add,inspect
Implememts manifest subcommands create, add, inspect.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-04-22 20:05:21 -04:00
Jhon Honce be5605ac4f V2 Restore rmi tests
* Introduced define.ErrImageInUse to assist in determining the exit code
  without resorting string searches.

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-04-22 15:34:33 -07:00
OpenShift Merge Robot 142757bd72
Merge pull request #5947 from rhatdan/v
Turn on version.go except for -v check
2020-04-22 23:10:46 +02:00
OpenShift Merge Robot 94dc39a41b
Merge pull request #5945 from rhatdan/pull
Fix podman push and podman pull to check for authfile
2020-04-22 21:26:42 +02:00
OpenShift Merge Robot cac05c8588
Merge pull request #5944 from rhatdan/untag
Fix integration tests for untag
2020-04-22 21:23:42 +02:00
Daniel J Walsh 34ee183ae6
Turn on version.go except for -v check
Currently podman -v does not work but the other version checks all pass.

enabling tests to that we can get more tests running in CI.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-22 15:18:42 -04:00
OpenShift Merge Robot 9a910efcf6
Merge pull request #5202 from QiWang19/path-config-storageconf
test rootless_storage_path from storage.conf
2020-04-22 20:57:14 +02:00
Daniel J Walsh ae1731e03f
Fix podman push and podman pull to check for authfile
This fixes pull_test.go push_test.go is still broken because of
lack of registry support.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-22 14:30:40 -04:00
OpenShift Merge Robot 366fc0520b
Merge pull request #5941 from jwhonce/jira/792
V2 Restore exists E2E tests
2020-04-22 20:22:44 +02:00
Brent Baude 6fdcc09a20
Fix integration tests for untag
Signed-off-by: Brent Baude <bbaude@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-22 14:13:07 -04:00
Qi Wang d422799595 test rootless_storage_path from strorage.conf
test rootless_storage_path from strorage.conf. If user configured rootless_storage_path in storage.conf, podman info should suggest the change.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-04-22 14:02:32 -04:00
OpenShift Merge Robot 703fd50553
Merge pull request #5940 from rhatdan/rm
Fix podman rm to have correct exit codes
2020-04-22 19:33:00 +02:00
Jhon Honce d0caf90940 V2 Restore exists E2E tests
* Fix setting exit code in */exists.go

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-04-22 09:53:05 -07:00
Daniel J Walsh 1be8ded964
Fix podman rm to have correct exit codes
If you attempt to remove a running container is it supposed to exit with
2
If you attempt to remove a non existing container is is supposed to exit with
1

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-22 11:53:00 -04:00
Qi Wang 6e33c328b9 Fix v2 test podman info
Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-04-22 11:46:44 -04:00
Daniel J Walsh 94b62dac74
Fix handling of --cidfile on create/run
Currently create and run are ignoring the cidfile flag.

Enable stop_test.go to make sure this works.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-22 09:52:33 -04:00
Daniel J Walsh 4494ec6f04
vendor in containers/common v0.9.4
This will change the default of UserNS to false

Also turn on tests for create_staticip_test.go
run_device_test.go, run_selinux_test.go

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-22 06:57:06 -04:00
Brent Baude 5c968b7693 Force integration tests to pass
Failing tests are now skipped and we should work from this.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-21 13:48:50 -05:00
Sujil02 37f3b191d5 Add pod prune for api v2.
Add the ability to prune pods for api v2,
Includes the addition of force flag, for client side prompt.
Update test suite to support this use case.

Signed-off-by: Sujil02 <sushah@redhat.com>
2020-04-17 17:30:58 -04:00
OpenShift Merge Robot bd8a0b08cd
Merge pull request #5548 from kunalkushwaha/image-prune
image prune skips images with child images.
2020-04-17 15:19:45 -04:00
Brent Baude 44a8cf8676 Fixes for system tests
Various fixes to protect against regressions in system tests

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-17 13:22:06 -05:00
Brent Baude ba430bfe5e podman v2 remove bloat v2
rid ourseleves of libpod references in v2 client

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-16 12:04:46 -05:00
OpenShift Merge Robot ef297d466e
Merge pull request #5767 from edsantiago/logformat_add_anchors_and_apiv2
logformat: handle apiv2 results, add anchor links
2020-04-15 10:50:15 -07:00
Kunal Kushwaha d832136349 test case added for image prune cache image
test case added for skipping cache images and
fixed condition in test case for prune dangling image

Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
2020-04-15 02:49:47 +00:00
Brent Baude 830f3a4462 v2podman ps revert structure changes
reverting name changes to the listcontainer structure because it negatively impacted the direct consumption of the restful API.  instead we now use a local structure in the CLI to modify the output as needed.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-14 09:40:43 -05:00
Brent Baude 90ead05903 Fixes for load and other system tests
Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-13 13:08:04 -05:00
OpenShift Merge Robot 3a4bd39516
Merge pull request #5771 from giuseppe/fix-exec-preserve-fd
test: fix exec preserve-fds test
2020-04-09 16:40:32 +02:00
OpenShift Merge Robot 1662310e51
Merge pull request #5754 from baude/v2psformat
v2podman ps alter formats
2020-04-09 15:56:26 +02:00
Giuseppe Scrivano 4503650f41
test: enable preserve fds test for crun
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-09 10:17:43 +02:00
Giuseppe Scrivano d3cfa7a23c
test: fix exec preserve-fds test
it specifies a fd is passed down but we are not really doing it, and
it triggers the wrong fd to be closed by Podman after the OCI runtime
invocation.

Closes: https://github.com/containers/libpod/issues/5769

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-09 10:17:42 +02:00
Ed Santiago 55eea9127a logformat: handle apiv2 results, add anchor links
apiv2 tests emit TAP-compliant output; recognize it and
highlight it the same way we do BATS tests.

Add anchor links to TAP output, so other tools (e.g.
cirrus-flake-summarize) can link to particular lines

And, remove a "-f" from "wait" in test-apiv2; looks
like there's some version of bash used in some CI VM
that doesn't grok it.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-04-08 12:10:24 -06:00
Brent Baude 8ce23775a6 v2podman ps alter formats
in order to get the go templating to work for custom input, we now use structure methods instead of template map funcs.  this requires some manipulation of fields so that the funcs can have the proper names.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-08 09:11:26 -05:00
Jhon Honce e0847f5457 V2 podman system service
* Added support for system service
* Enabled linting on the varlinkapi source, needed to support V2
  service command
* Added support for PODMAN_SOCKET

Skip linting deprecated code

Rather than introduce bugs by correcting deprecated code, linting the
code is being skipped. Code that is being ported into V2 is being
checked.

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-04-07 19:22:10 -07:00
OpenShift Merge Robot 9d0d9df6a1
Merge pull request #5157 from QiWang19/rootless-test-login
fix rootless login/logout tests
2020-04-07 19:32:09 +02:00
Qi Wang 7f801b437f fix rootless login/logout tests
fix rootless login/logout tests. Since c/image can support peruser certs directory, this path uses $HOME dir as certs.d to avoid permission deny failures.

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-04-06 18:01:45 -04:00
OpenShift Merge Robot 64b6a19733
Merge pull request #5478 from giuseppe/auto-userns
userns: support --userns=auto
2020-04-06 23:08:36 +02:00
Brent Baude e20ecc733c refactor info
the current implementation of info, while typed, is very loosely done so.  we need stronger types for our apiv2 implmentation and bindings.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-04-06 12:45:42 -05:00
Giuseppe Scrivano 3a0a727110
userns: support --userns=auto
automatically pick an empty range and create an user namespace for the
container.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-06 16:32:36 +02:00
OpenShift Merge Robot 3542700d6e
Merge pull request #5707 from adrianreber/crun-checkpoint-1
Prepare for crun checkpoint support
2020-04-03 19:56:03 +02:00
Adrian Reber 7660330ae2
checkpoint: change runtime checkpoint support test
Podman was checking if the runtime support checkpointing by running
'runtime checkpoint -h'. That works for runc.

crun, however, does not use '-h, --help' for help output but, '-?,
--help'.

This commit switches both checkpoint support detection from
 'runtime checkpoint -h'
to
 'runtime checkpoint --help'.

Podman can now correctly detect if 'crun' also support checkpointing.

Signed-off-by: Adrian Reber <areber@redhat.com>
2020-04-03 18:00:57 +02:00
OpenShift Merge Robot ccb9e579c4
Merge pull request #5702 from kolyshkin/test-nitpicks
test/e2e/run_volume_test nitpicks
2020-04-03 11:52:28 +02:00
Kir Kolyshkin e39cf4cf59 test/e2e/run_volume_test: use unique mount point
For volume and bind mount tests, use the in-container mount point path
that has no common ancestor with any host path (except for root).

This might help to uncover bugs like [1]. Even if not, it seems
lile a good cleanup regardless.

[1] https://github.com/containers/libpod/pull/5676

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-02 10:19:40 -07:00
Kir Kolyshkin 504f9082ee test/e2e/run_volume_test.go: mv dockerfile decl
Move declaration of a dockerfile closer to its use.
Since it is used only once, there's no sense in having it declared
globally.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-02 10:17:10 -07:00
Kir Kolyshkin ce38be7959 test/e2e/run_volume_test: only create dir once
Remove repeated mountPath directory creation.

 * For the first two hunks it is the same dir ("secrets") that was
   already created before.

 * For the last hunk ("scratchpad") it is not used at all.

Add an empty line after Mkdir for cases where dir is used more than once.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-02 10:17:10 -07:00
Daniel J Walsh 1f8569f7d7
Fix environment handling from containers.conf
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-02 13:10:08 -04:00
Giuseppe Scrivano 4c02aa46c2
attach: fix hang if control path is deleted
if the control path file is deleted, libpod hangs waiting for a reader
to open it.  Attempt to open it as non blocking until it returns an
error different than EINTR or EAGAIN.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-04-02 09:15:56 +02:00
OpenShift Merge Robot 56ab9e4cc8
Merge pull request #5649 from jwhonce/wip/varlink
V2 Move varlink home
2020-03-31 20:34:36 +02:00
Daniel J Walsh 3449b27cd1
Switch to using --time as opposed to --timeout to better match Docker.
We need to consistently use --time rather then --timeout throughout the code.
Fix locations where timeout defaults are not set correctly as well.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-31 08:50:32 -04:00
Jhon Honce 7a12e01556 V2 Move varlink home
* move cmd/podman/varlink/* to pkg/varlink to support podmanV2 refactor
* update Makefile
* reformatted all impacted code

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-03-30 08:18:35 -07:00
OpenShift Merge Robot 0fa01c8bf8
Merge pull request #5643 from edsantiago/test_apiv2
API v2 tests: usability improvements
2020-03-30 16:51:58 +02:00
Daniel J Walsh 4352d58549
Add support for containers.conf
vendor in c/common config pkg for containers.conf

Signed-off-by: Qi Wang qiwan@redhat.com
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-03-27 14:36:03 -04:00
Ed Santiago 46e434e2cb API v2 tests: usability improvements
* Allow for descriptive comment in 't' invocations, making it
  easier to distinguish similar requests
* Include test file basename (eg 40-pods) in 'ok/not ok' line
* Always symlink $TMPDIR/test-apiv2.log to latest YYMMDDetc file
* Include test result ('ok', 'not ok') in said log
* When curl results are JSON, filter them through jq into log

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-03-27 12:25:59 -06:00
OpenShift Merge Robot 4233250c43
Merge pull request #5611 from baude/v2podcreate
podmanv2 pod create using podspecgen
2020-03-27 16:25:30 +01:00
OpenShift Merge Robot 3ddb5b10d5
Merge pull request #5595 from stefano-pogliani/pod-ps-filter-label
Support label filters for podman pod ps
2020-03-27 15:18:27 +01:00
Brent Baude e56d529561 podmanv2 pod create using podspecgen
using the factory approach similar to container, we now create pods based on a pod spec generator.  wired up the podmanv2 pod create command, podcreatewithspec binding, simple binding test, and apiv2 endpoint.

also included some code refactoring as it introduced as easy circular import.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-03-27 09:04:10 -05:00
Valentin Rothberg 2c4ac55c81 use `pause:3.2` image for infra containers
The `pause:3.1` has wrong configs for non-amd64 images as they all claim
to be for amd64.  The issue has now been fixed in the latest
`pause:3.2`.

[1] https://github.com/kubernetes/kubernetes/issues/87325

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-03-27 10:32:04 +01:00
Stefano Pogliani df568e4963
Support label filters for podman pod ps.
Update the podman pod ps command to support filtering by labels.
This brings the command in line with the documentation as well as
the functionality by the containers equivalent podman ps.

Signed-off-by: Stefano Pogliani <stefano@spogliani.net>
2020-03-26 23:11:07 +00:00
Brent Baude 2fa78938a9 podmanv2 container inspect
add ability to inspect a container

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-03-26 15:54:26 -05:00
Brent Baude c5ce210f7d podmanv2 pod subcommands
add pod kill, pause, restart, rm, start, stop, and unpause

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-03-26 14:14:05 -05:00
OpenShift Merge Robot 48b3143656
Merge pull request #5436 from QiWang19/rm_created_ctr
container prune remove state created, configured
2020-03-23 15:45:26 +01:00
Daniel J Walsh 31d14457a5
Merge pull request #5582 from kunalkushwaha/bugfix-5001
Improved readability in image json output
2020-03-22 17:40:20 -04:00
Kunal Kushwaha 19bf7adedb Improved readability in image json output
Changes made in json output to improve readability of
podman images output.

Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
2020-03-22 21:38:07 +09:00
Brent Baude 232b5034cf when removing networks for tests, force should be used
when removing networks in integration tests, we should should force; otherwise if the network has containers associated with it, it will fail to remove.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-03-20 16:19:58 -05:00
OpenShift Merge Robot ccc30c606e
Merge pull request #5539 from sujil02/issue-5461
Implemented --iidfile for podman commit
2020-03-20 11:45:32 +01:00
Sujil02 5efa6dae90 Implemented --iidfile for podman commit
Added flag to Write the image ID to the file with podman commit command.
Fix to issue #5461

Signed-off-by: Sujil02 <sushah@redhat.com>
2020-03-19 16:32:02 -04:00
Jhon Honce 651ddd3560 Reduce CPU usage when --timeout=0
* Add second go routine for when a Timer is not needed.
* goimports updated some project files

Fixes #5531

Signed-off-by: Jhon Honce <jhonce@redhat.com>
2020-03-18 10:27:25 -07:00
OpenShift Merge Robot 412a114d33
Merge pull request #5439 from ttys3/fixup-systemdgen-with-new-param
systemd generator: force run container detached if CreateCommand has no detach param
2020-03-16 14:40:02 +01:00
OpenShift Merge Robot 4e13ef58c8
Merge pull request #5476 from edsantiago/run_rmi_test_fix
run --rmi test: make it work
2020-03-16 12:51:50 +01:00
Brent Baude 9ca4b6c6f5 add os|arch attributes when building
when building images, we can now add the os and arch of the image using overrides from the commandline.  the commandline options set sane defaults so we use those as well.

Fixes: #5503

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-03-15 12:49:42 -05:00
荒野無燈 194723f314
force run container detached if container CreateCommand missing the detach param
the podman generated systemd service file has `Type=forking` service,
so the command after `ExecStart=` should not run in front.
if someone created a container and has the detach(`-d`) param missing
like this
```
podman create --name ngxdemo -P nginxdemos/hello
```
and generate the file with `--new` param:
```
podman generate systemd --name --new ngxdemo
```
because `podman run xxx` has no `-d` param,
so the container is not run in background and nerver exit.
and systemd will fail to start the service:
```
sudo systemctl start container-ngxdemo.service
Job for container-ngxdemo.service failed because a timeout was exceeded.
See "systemctl status container-ngxdemo.service" and "journalctl -xe" for details.
```

Signed-off-by: 荒野無燈 <ttys3@outlook.com>
2020-03-14 21:54:12 +08:00
Ed Santiago 3585780876 run --rmi test: make it work
The recently-added 'run --rmi' test was not actually doing
what it thinks it was doing: for one, 'run_podman | grep'
is never going to work; also, the test was leaving behind
stray images.

Rework to do what I believe the intention was; and, combine
into one test (down from two) for readability.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-03-12 07:57:11 -06:00
Qi Wang abb60fbba2 container prune remove state created, configured
podman container prune should remove containers with state Created, Configured to be compatible with docker

Signed-off-by: Qi Wang <qiwan@redhat.com>
2020-03-10 10:57:51 -04:00
OpenShift Merge Robot 3d48940927
Merge pull request #5307 from QiWang19/security-opt-genkube
fix security-opt generate kube
2020-03-09 22:22:29 +01:00
Valentin Rothberg a5c04c793e generate systemd: remove leading slashes
Remove leading slashes from the run-dir paths. It was meant to make it
explicit that we're dealing with an absolute path but user feedback has
shown that most are aware.  It also cleans up the path in the systemctl
status output.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-03-05 14:05:48 +01:00