7282 Commits

Author SHA1 Message Date
4284fd4255 Merge pull request #13913 from vrothberg/1.9-backports
[v1.9] fix CVE-2022-1227
2022-04-19 08:44:38 -04:00
35390d96c5 [v1.9] fix CVE-2022-1227
Vendor in the backports for psgo from the dedicated v1.4.0-rhel branch.
Note that c/storage is also vendored by a commit.  We couldn't cut a
v1.19.2 for RHEL backports since Podman v1.19.1 is in Podman v1.9.3.
v1.19.2 has been cut after the Podman release with changes that have
not been approved for RHEL.  Hence the dedicated release-1.19-podman-1.9-rhel
bran in c/storage.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-04-19 10:45:45 +02:00
c7a4d3173d Merge pull request #7709 from cevich/fix_cirrus_v1.9
Cirrus: Fix decrypt failure
2020-09-24 16:57:09 +00:00
15f6d6e119 Cirrus: Deprecate non-essential testing
Signed-off-by: Chris Evich <cevich@redhat.com>
2020-09-24 09:43:15 -04:00
40b051d60f Cirrus: Fix decrypt failure
Signed-off-by: Chris Evich <cevich@redhat.com>
2020-09-21 10:35:28 -04:00
31533cf041 Merge pull request #6745 from vrothberg/1.9-disable-bindings-test
[1.9] CI: disable bindings tests
2020-06-24 09:21:46 -04:00
87c32b5aa1 [1.9] CI: disable bindings tests
Disable the bindings tests in the CI.  They primarilly targetted Podman
v2 development and pretty flaky and make backporting a bit harder.
So let's just silence them for the 1.9 branch.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-06-24 12:44:06 +02:00
6d7c121ec3 Merge pull request #6723 from vrothberg/1.9-ci
[1.9] CI: force registry:2.6
2020-06-23 16:46:12 -04:00
b8950f9369 Fix leak of empty tarball
In cases of trying to export an image, if the image was not found, we leaked an empty tarball or directory depending on the format.

Fixes: #6409

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-06-23 14:44:01 +02:00
bde49bc442 CI: force registry:2.6
For using the `registry:2.6` image. 2.7 and beyond dropped the
`htpasswd` binary from the rootfs which parts of our CI depends
on.

While this is not a sustainable solution (assuming `htpasswd` is gone
for ever), it unblocks the CI for now.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-06-23 11:46:07 +02:00
a030126593 Merge pull request #6424 from mtrmac/image-5.4.4
Update to containers/image 5.4.4
2020-05-29 05:55:10 -04:00
bbc4a3aa49 Update to containers/image 5.4.4
... primarily for https://github.com/containers/image/pull/912

Note that this drags in several other updates, notably c/storage.
See vendor/modules.txt for the full details.

> go get github.com/containers/image/v5@v5.4.4
> make vendor

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2020-05-29 00:43:03 +02:00
67f236701c Merge pull request #6351 from mheon/bump_193
Bump to v1.9.3
2020-05-22 21:57:31 +02:00
0c6408a996 Bump to v1.9.4-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-05-22 13:34:52 -04:00
5d44534fff Bump to v1.9.3
Signed-off-by: Matthew Heon <mheon@redhat.com>
v1.9.3
2020-05-22 13:34:31 -04:00
123c0f9ce1 Merge pull request #6346 from mheon/release_notes_193
Update release notes for v1.9.3
2020-05-22 18:12:22 +02:00
2478ec3ae2 Update release notes for v1.9.3
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-05-22 11:02:43 -04:00
d48a47acbe Merge pull request #6325 from mheon/noexec_backport
Turn off 'noexec' option by default for named volumes
2020-05-22 16:51:04 +02:00
67812a52ca Turn off 'noexec' option by default for named volumes
We previously enforced this for security reasons, but as Dan has
explained on several occasions, it's not very valuable there
(it's trivially easy to bypass) and it does seriously annoy folks
trying to use named volumes. Flip the default from 'on' to 'off'.

This is a backport from the master branch to v1.9 branch.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-05-22 09:50:53 -04:00
c210bb16ff Merge pull request #6282 from rhatdan/pids
[1.9] Fix mountpont in SecretMountsWithUIDGID
2020-05-20 12:38:41 -04:00
70340244b8 Fix mountpont in SecretMountsWithUIDGID
FIPS Mode is failing, because we are attempting to mount the backend
directory from the wrong spot.  The parameter is supposed to be
the container image mountpoint not the runtime directory.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-05-19 16:35:56 -04:00
e4ded37b8a Merge pull request #6194 from rhatdan/pids
vendor to containers/buildah 1.14.9
2020-05-19 20:37:55 +02:00
a1790be9cb Merge pull request #6267 from baude/varlinkbuild
Fix EOM for SendFile
2020-05-18 21:33:44 +02:00
904ee392f1 Fix EOM for SendFile
To terminate a connection of varlink, say after sending a file, we need to send a message containing a delimiter of ':' so the client knows to hang up.

Fixes: #6237

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-05-18 12:34:41 -05:00
5bfc145519 Merge pull request #6216 from mheon/release_v1.9.2
Bump to v1.9.2
2020-05-13 12:49:26 -07:00
90557be108 Bump to v1.9.3-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-05-13 14:16:04 -04:00
de2379a758 Bump to v1.9.2
Signed-off-by: Matthew Heon <mheon@redhat.com>
v1.9.2
2020-05-13 14:15:23 -04:00
ca0617d0e3 Merge pull request #6210 from mheon/release_notes_192
[CI:DOCS] Add release notes for v1.9.2
2020-05-13 10:54:20 -07:00
74c220b394 Add release notes for v1.9.2
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2020-05-13 10:50:08 -04:00
2cacad0f7b Merge pull request #6198 from haircommander/skip-unified-1.9
[1.9] cgroup: skip unified if we are using v1
2020-05-12 12:38:33 -07:00
0c81e2256c cgroup: skip unified if we are using v1
There exists a chance for a node to be booted in v1, but have reminents of v2. An example is this CRI-O ci run: https://deck-ci.apps.ci.l2s4.p1.openshiftapps.com/view/gcs/origin-federated-results/pr-logs/pull/cri-o_cri-o/3565/test_pull_request_crio_critest_fedora/11243/

We fail because we are incorrectly writing to the unified path, because we are v1. We should not write to the unified path if we are v1

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2020-05-12 14:32:01 -04:00
ef1c5cdc97 vendor to containers/buildah 1.14.9
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-05-12 13:08:23 -04:00
1b3dc66e73 Merge pull request #6175 from vrothberg/1.9-common
[1.9] vendor github.com/containers/common@v0.8.4
2020-05-12 04:59:56 -07:00
7ec6e25aa2 [1.9] vendor github.com/containers/common@v0.8.4
Fixes: #6163
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-05-12 12:42:43 +02:00
4a1bb394a2 Merge pull request #6122 from rhatdan/pids
Set pids-limit to 0 on non cgroupv2 rootless systems
2020-05-12 03:21:01 -07:00
811c5dea8d Merge pull request #6180 from mheon/add_hairpin_19
Add HairpinMode to our CNI configs [v1.9]
2020-05-12 03:15:51 -07:00
15500c028a Add HairpinMode to our CNI configs
This may resolve some issues with routing traffic between
containers using the host's IP.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2020-05-11 14:01:44 -04:00
60dc80f9f3 Set pids-limit to 0 on non cgroupv2 rootless systems
Rootless cgroups V1 does not support setting a pids limit.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-05-11 13:55:28 -04:00
5ac8e15613 Merge pull request #6125 from rhatdan/reset
Update containers/common to v0.8.3
2020-05-08 19:24:27 +02:00
dca6856728 Merge pull request #6102 from rhatdan/makefile
Add command to build podman-remote-static
2020-05-08 15:09:55 +02:00
6b5be634b9 Merge pull request #6095 from rhatdan/old
Set up ulimits for rootless containers.
2020-05-08 13:51:36 +02:00
4e8d074eb1 Merge pull request #6131 from vrothberg/pidfile-1.9
[1.9] add --conmon-pidfile/--cidfile system test
2020-05-08 12:37:03 +02:00
c433e74ad5 [1.9] add --conmon-pidfile/--cidfile system test
Add a system test to make sure that pidfile and cidfile are being
generated.  Podman regressed in master and given 1.9 will be supported
for a while, let's make extra sure we're catching potential on these
flags early.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2020-05-08 10:59:43 +02:00
cb7b97ce5e Fix handling of overridden paths from database
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-05-07 18:02:41 -04:00
5c1c7b77ce Add command to build podman-remote-static
CRC Team wants a static podman-remote that it can install on any linux
box.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-05-07 14:40:31 -04:00
6daf26fe58 Set up ulimits for rootless containers.
Currently we are setting the maximum limits for rootful podman containers,
no reason not to set them by default for rootless users as well

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-05-06 10:46:42 -04:00
e9b178556d Merge pull request #6028 from rhatdan/old
User specified environment after other environments are set
2020-05-01 21:18:04 +02:00
cc4a1ea8d3 User specified environment after other environments are set
Users can not currently override the environment variables set by
--http-proxy

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2020-04-29 16:09:07 -04:00
b5af022859 Merge pull request #6040 from giuseppe/1.9-rootless
[1.9] rootless: backport two patches
2020-04-29 21:03:20 +02:00
fb51b3b961 Merge pull request #6032 from sujil02/v1.9
Fixes podman save fails when specifying an image using a digest #5234
2020-04-29 17:17:28 +02:00