~jackweirdy/podman/+git/main:v2.1

Last commit made on 2020-11-18
Get this branch:
git clone -b v2.1 https://git.launchpad.net/~jackweirdy/podman/+git/main

Branch merges

Branch information

Name:
v2.1
Repository:
lp:~jackweirdy/podman/+git/main

Recent commits

9d8a948... by OpenShift Merge Robot <email address hidden>

Merge pull request #8140 from afbjorklund/podman-remote-host-port

Add support for host keys for non-22 ports (v2.1)

8794e8d... by Anders F Björklund

Add support for host keys for non-22 ports

When not using the standard SSH port (22), the port is appended
to the hostname (in brackets) like so: "host" -> "[host]:1234"

Signed-off-by: Anders F Björklund <email address hidden>

9b0f5dd... by OpenShift Merge Robot <email address hidden>

Merge pull request #7921 from vrothberg/v2.1-bz-1884668

[v2.1] compat: images/create: fix tag parsing

ba0e0a5... by Valentin Rothberg <email address hidden>

compat: images/create: fix tag parsing

The `tag` parameter of the compat `images/create` endpoint can be both,
a tag and a digest. Fix parsing of the parameter to detect digests and
use the appropriate `@` separator.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1884668
Signed-off-by: Valentin Rothberg <email address hidden>

3873f30... by OpenShift Merge Robot <email address hidden>

Merge pull request #7915 from lsm5/v2.1-net-host-backport

[2.1] Ignore containers.conf sysctl when namespaces set to host

e896ca9... by Dan Walsh

Ignore containers.conf sysctl when namespaces set to host

If user sets namespace to host, then default sysctls need to be ignored
that are specific to that namespace.

--net=host ignore sysctls that begin with net.
--ipc=host ignore fs.mqueue
--uts=host ignore kernel.domainname and kernel.hostname

Signed-off-by: Daniel J Walsh <email address hidden>
(cherry picked from commit 0d70df119539d818224b0d014602aaad2bd1b95e)
Signed-off-by: Lokesh Mandvekar <email address hidden>

58a2e07... by OpenShift Merge Robot <email address hidden>

Merge pull request #7898 from giuseppe/backport-fix-capabilities

[2.1] capabilities: always set ambient and inheritable

f352500... by OpenShift Merge Robot <email address hidden>

Merge pull request #7897 from lsm5/v2.1-gating-backport

[2.1] Gating-test fix: deal with new crun error msg

445b6cc... by Giuseppe Scrivano <email address hidden>

capabilities: always set ambient and inheritable

change capabilities handling to reflect what docker does.

Bounding: set to caplist
Inheritable: set to caplist
Effective: if uid != 0 then clear; else set to caplist
Permitted: if uid != 0 then clear; else set to caplist
Ambient: clear

Signed-off-by: Giuseppe Scrivano <email address hidden>
(cherry picked from commit 703381b4a2b1dc761ffee0d8e36b47f21ffd92c5)

b60d033... by Ed Santiago <email address hidden>

Gating-test fix: deal with new crun error msg

crun changed an error message:

   https://github.com/containers/crun/pull/439

It's a good change, absolutely the right thing to do, but
it broke gating tests. Fix tests so they handle both old
and new format.

Fixes: #7814

Signed-off-by: Ed Santiago <email address hidden>
(cherry picked from commit f732e2edcb5a1b925aa2bea65bfe1162edec032e)
Signed-off-by: Lokesh Mandvekar <email address hidden>