8859 Commits

Author SHA1 Message Date
d493374eb4 Merge pull request #7050 from edsantiago/logformat_trim_remote
logformatter: handle podman-remote
2020-07-22 20:53:51 +02:00
e4ce175509 Merge pull request #7048 from rhatdan/remotetest
Turn on a bunch more remote tests
2020-07-22 20:50:54 +02:00
a95f195635 Merge pull request #7047 from edsantiago/ci_login_flake_fix
CI: attempt to fix flake in login test
2020-07-22 20:48:02 +02:00
0da4fa280b Merge pull request #6822 from cevich/add_htpasswd
Cirrus: Add packages that provide htpasswd
2020-07-22 20:25:14 +02:00
80f57acc03 Publish IP from YAML (podman play kube)
podman play kube didn't set host ip correctly from YAML

Signed-off-by: Ashley Cui <acui@redhat.com>
2020-07-22 14:05:17 -04:00
a75f96ae90 Turn on a bunch more remote tests
We need to be more specific about the remote tests we turn off.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-22 13:13:28 -04:00
0e85768c96 logformatter: handle podman-remote
Oops! Logs of podman-remote tests are unreadable, they have
multiple (useless) --remote options plus '--url /something/long'
that makes it impossible to read the actual command being run.
This commit strips off '--remote' entirely, and hides '--url'
and its arg in the only-on-mouse-hover '[options]' text.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-07-22 10:32:06 -06:00
6acea29a80 Cirrus: Switch to freshly built image
Note: The libpod -> podman change in the image name comes by way of an
intentional repository rename.

Signed-off-by: Chris Evich <cevich@redhat.com>
2020-07-22 11:51:32 -04:00
fe56be28c1 Cirrus: Add packages that provide htpasswd
Mainly needed for buildah testing: the htpasswd command was removed from
the upstream registry container image.  Making it available on the
host-side enables configuring details needed by the registry during
it's initial setup.

Signed-off-by: Chris Evich <cevich@redhat.com>
2020-07-22 11:51:32 -04:00
18a1514139 Cirrus: Ensure GOPATH is properly set during image-builds
Signed-off-by: Chris Evich <cevich@redhat.com>
2020-07-22 11:51:32 -04:00
96a9ddb266 CI: attempt to fix flake in login test
Fixes: #5212

...or at least I hope it does. The symptom seems to be that
INTEGRATION_ROOT is not being defined in some code flows.
This PR blindly implements a suggestion from Miloslav,
setting INTEGRATION_ROOT in one more place.

We won't actually know for a long time if this works or
not, because the test failure is a flake.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-07-22 08:13:41 -06:00
80add2902c Merge pull request #6992 from rhatdan/apparmor
Support default profile for apparmor
2020-07-22 15:38:42 +02:00
9f5d1462be Merge pull request #6955 from edsantiago/logformatter_fix_bucket_name
logformatter: update MAGIC BLOB string
2020-07-22 08:45:15 -04:00
558809d4bb Merge pull request #7044 from rhatdan/remotetest
Enable a bunch of remote tests
2020-07-22 08:42:27 -04:00
ef03815117 Merge pull request #7045 from containers/dependabot/go_modules/github.com/containers/storage-1.21.2
Bump github.com/containers/storage from 1.21.1 to 1.21.2
2020-07-22 07:39:55 -04:00
d88e316913 Merge pull request #7046 from containers/dependabot/go_modules/github.com/containers/common-0.17.0
Bump github.com/containers/common from 0.16.0 to 0.17.0
2020-07-22 07:37:16 -04:00
60c1d91657 Merge pull request #7032 from vrothberg/coverage
make localunit: record coverage
2020-07-22 07:13:59 -04:00
4c4a00f63e Support default profile for apparmor
Currently you can not apply an ApparmorProfile if you specify
--privileged.  This patch will allow both to be specified
simultaniosly.

By default Apparmor should be disabled if the user
specifies --privileged, but if the user specifies --security apparmor:PROFILE,
with --privileged, we should do both.

Added e2e run_apparmor_test.go

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-22 06:27:20 -04:00
59bad8bf71 Merge pull request #7006 from ashley-cui/umask
Add --umask flag for create, run
2020-07-22 05:40:32 -04:00
2643967bc0 Merge pull request #7002 from zhangguanzhang/master
fix podman play kube doesn't override dockerfile ENTRYPOINT
2020-07-22 05:37:35 -04:00
4c7fc773f6 Bump github.com/containers/storage from 1.21.1 to 1.21.2
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.21.1 to 1.21.2.
- [Release notes](https://github.com/containers/storage/releases)
- [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md)
- [Commits](https://github.com/containers/storage/compare/v1.21.1...v1.21.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-22 05:36:43 -04:00
c0998f728a Merge pull request #7040 from mheon/no_exec_errmsg
Do not print an error message on non-0 exec exit code
2020-07-22 05:34:17 -04:00
ca049ef6f9 Bump github.com/containers/common from 0.16.0 to 0.17.0
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.16.0 to 0.17.0.
- [Release notes](https://github.com/containers/common/releases)
- [Commits](https://github.com/containers/common/compare/v0.16.0...v0.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-22 05:29:34 -04:00
65e1638f9b Enable a bunch of remote tests
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-21 19:23:24 -04:00
344a791ac2 Merge pull request #7025 from mheon/readme_updates
Update the README to reflect the libpod move
2020-07-21 16:42:37 -04:00
17ba396494 Enable --remote flag
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-21 15:22:15 -04:00
d4d3fbc155 Add --umask flag for create, run
--umask sets the umask inside the container
Defaults to 0022

Co-authored-by: Daniel J Walsh <dwalsh@redhat.com>
Signed-off-by: Ashley Cui <acui@redhat.com>
2020-07-21 14:22:30 -04:00
a87579cedf fix play kube doesn't override dockerfile ENTRYPOINT
Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
2020-07-22 02:17:11 +08:00
e5b3563a89 Merge pull request #7036 from rhatdan/docker
Add noop function disable-content-trust
2020-07-21 13:43:58 -04:00
90e547ec1a Do not print an error message on non-0 exec exit code
This was added with an earlier exec rework, and honestly is very
confusing. Podman is printing an error message, but the error had
nothing to do with Podman; it was the executable we ran inside
the container that errored, and per `podman run` convention we
should set the Podman exit code to the process's exit code and
print no error.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-07-21 13:28:40 -04:00
26410e4f4e Merge pull request #7037 from edsantiago/bats
BATS help-message test: improve diagnostics
2020-07-21 13:19:01 -04:00
5abf33de32 Merge pull request #7028 from xordspar0/patch-1
docs: Fix formatting mistake
2020-07-21 13:16:05 -04:00
be5219ab95 Merge pull request #7035 from ashley-cui/api_gen
Fix Generate API swagger title/description
2020-07-21 11:21:59 -04:00
111a1fe082 Document proxy env var precedence
Signed-off-by: Jordan Christiansen <xordspar0@gmail.com>
2020-07-21 10:11:05 -05:00
f8e2a3500e Merge pull request #6902 from vrothberg/events-endpoint
events endpoint: fix panic and race condition
2020-07-21 10:55:40 -04:00
2b323f2238 BATS help-message test: improve diagnostics
The error messages from the 'podman xxx --help' cross-check
test are unhelpful, and cause much wasted time when they trigger.

Solution: instead of using the built-in exit-status check
in run_podman, do an explicit check outside of run_podman.
This lets us die() with a custom, hopefully useful, message.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-07-21 08:31:56 -06:00
fc52aa6704 Add noop function disable-content-trust
People who use docker scripts with Podman see failures
if they use disable-content-trust flag.  This flag already
existed for podman build, adding it to pull/push/create/run.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-21 10:18:27 -04:00
5d25d1808a Fix Generate API title/description
generate kube title and descritopn was same as play kube for apiv2 docs

Signed-off-by: Ashley Cui <acui@redhat.com>
2020-07-21 10:03:25 -04:00
25105b91db docs: Clarify how env var overriding works
Signed-off-by: Jordan Christiansen <xordspar0@gmail.com>
2020-07-21 08:50:55 -05:00
1aa67b541d Update the README to reflect the libpod move
We no longer have to dance around the fact that the repo is named
"libpod" which simplifies the opening a bit. Also, refresh our
scope section and to-do section a bit.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-07-21 09:50:15 -04:00
a05c15da2f make localunit: record coverage
Inspirsed by CRI-O's coverage logic.  Initial coverage is at 15.7
percent.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-07-21 15:46:43 +02:00
644b5bc8a3 Merge pull request #7031 from vrothberg/root-check
unit tests: root check
2020-07-21 09:39:08 -04:00
d628de31d7 unit tests: root check
The unit tests currently require running as root.  This has caused some
confusion that justifies adding a root check to `make localunit` and
error out for non-root users instead of starting the tests deemed to
fail.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-07-21 13:31:43 +02:00
df6920aa79 Merge pull request #7009 from rhatdan/containers.conf
Switch references from libpod.conf to containers.conf
2020-07-21 05:54:57 -04:00
1682e60dac Merge pull request #7026 from edsantiago/bats_majorminor_warning_fix
BATS tests: more resilient remove_same_dev_warning
2020-07-21 05:52:09 -04:00
16e603147f docs: Fix formatting mistake
Part of this section was a code block, and part of it was absorbed into
the preceding normal paragraph.

Signed-off-by: Jordan Christiansen <xordspar0@gmail.com>
2020-07-20 20:27:58 -05:00
7bdf93ee63 logformatter: update MAGIC BLOB string
Fallout from libpod->podman repo name move: the HTML logs
created by logformatter are no longer accessible. They
render as:

    https://storage.googleapis.com/SECRET-5385732420009984-fcae48/artifacts/containers/podman/6313596734930944/html/integration_test.log.html

(yes, "SECRET" instead of "cirrus-ci". Possibly because
the GCE_SSH_USERNAME key, "cirrus-ci", was overzealously
encrypted, making Cirrus censor any instances of the
string in output. Let's see if this fixes it. But anyway
this is a secondary unrelated bug).

Reason: it looks like Cirrus "generated a new magic blob"
when we renamed libpod -> podman. Chris was kind enough to
locate the new magic blob and to give me a link to where
we can discover it ourselves. I added that as a code comment.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-07-20 14:02:14 -06:00
841eac0af6 Switch references from libpod.conf to containers.conf
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-07-20 15:09:54 -04:00
1405c3a205 BATS tests: more resilient remove_same_dev_warning
Some CI tests are flaking in the SELinux test, possibly because
there's a new variation of the "multiple devices" warning I hadn't
seen before:

   WARNING: Creating device "/dev/null" with same type, major and minor as existing "/dev/foodevdir/null".

Solution: in remove_same_dev_warning(), remove "multiple" from
the match string.

Also: fix a Go test that wasn't cleaning up after itself. And
add an actual test to it, not just check-exit-status.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2020-07-20 12:32:17 -06:00
0d26a573e3 Merge pull request #6895 from QiWang19/pr-3457
Add support for overlay volume mounts in podman.
2020-07-20 14:11:17 -04:00