Commit Graph

23756 Commits

Author SHA1 Message Date
openshift-merge-bot[bot]
07da6313c4 Merge pull request #24195 from edsantiago/055-cleanup
055-rm test: clean up a test, and document
2024-10-08 12:34:53 +00:00
openshift-merge-bot[bot]
7652e04398 Merge pull request #24202 from lsm5/packit-koji-build-constraint
[skip-ci] Packit: constrain koji and bodhi jobs to fedora package to avoid dupes
2024-10-08 11:09:37 +00:00
openshift-merge-bot[bot]
c8805f24c5 Merge pull request #24188 from containers/renovate/google.golang.org-protobuf-1.x
fix(deps): update module google.golang.org/protobuf to v1.35.0
2024-10-08 10:58:37 +00:00
Lokesh Mandvekar
3d1a4301af [skip-ci] Packit: constrain koji and bodhi jobs to fedora package to avoid dupes
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2024-10-08 16:04:16 +05:30
openshift-merge-bot[bot]
6d3ebe67f0 Merge pull request #24117 from containers/renovate/github.com-shirou-gopsutil-v4-4.x
fix(deps): update module github.com/shirou/gopsutil/v4 to v4.24.9
2024-10-08 10:22:52 +00:00
Ed Santiago
e7833d52cf 055-rm test: clean up a test, and document
There's an important reason why the healthcheck container in 055-rm
test uses 'sleep infinity' and not 'top. Document it.

And, the test itself wasn't actually working as intended. Make
it safer by confirming that the container actually enters
the "stopping" state.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2024-10-07 15:22:49 -06:00
openshift-merge-bot[bot]
6b0ad8269c Merge pull request #24182 from containers/renovate/golang.org-x-tools-0.x
fix(deps): update module golang.org/x/tools to v0.26.0
2024-10-07 16:59:17 +00:00
renovate[bot]
43a4bddd10 fix(deps): update module google.golang.org/protobuf to v1.35.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-07 13:11:58 +00:00
openshift-merge-bot[bot]
e71d8a36e5 Merge pull request #24183 from Luap99/info-socket-url
server: fix url parsing in info
2024-10-07 13:10:36 +00:00
openshift-merge-bot[bot]
35768aef2b Merge pull request #24173 from containers/renovate/golang.org-x-net-0.x
fix(deps): update module golang.org/x/net to v0.30.0
2024-10-07 11:29:55 +00:00
renovate[bot]
385e2ea650 fix(deps): update module golang.org/x/net to v0.30.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-07 10:26:51 +00:00
openshift-merge-bot[bot]
741818e010 Merge pull request #24172 from containers/renovate/golang.org-x-crypto-0.x
fix(deps): update module golang.org/x/crypto to v0.28.0
2024-10-07 10:15:39 +00:00
Paul Holzinger
45df394072 server: fix url parsing in info
When we are activated by systemd the code assumed that we had a valid
URL which was not the case so it failed to parse the URL which causes
the info call to fail all the time.
This fixes two problems first add the schema to the systemd activated
listener URL so it can be parsed correctly but second simply do not
parse it as url as all we care about in the info call is if it is unix
and the file path exists.

Fixes #24152

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-10-07 12:03:56 +02:00
renovate[bot]
b8dbe09f98 fix(deps): update module golang.org/x/tools to v0.26.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-07 10:00:55 +00:00
openshift-merge-bot[bot]
1867ecc96a Merge pull request #24171 from containers/renovate/github.com-mattn-go-sqlite3-1.x
fix(deps): update module github.com/mattn/go-sqlite3 to v1.14.24
2024-10-07 10:00:04 +00:00
Paul Holzinger
e2e1996c6a Makefile: fix ginkgo FOCUS option
This fixes a regression that causes the FOCUS option to not work
correctly as the --silence-skips is passes to --focus not as extra
option.

Fixes 23f256349b ("Makefile - silence skipped tests when focusing on a file")

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-10-07 11:56:41 +02:00
openshift-merge-bot[bot]
95a55f971c Merge pull request #24177 from eriksjolund/docs-prefer-option-network
docs: prefer --network to --net
2024-10-07 09:18:50 +00:00
renovate[bot]
fbd9fe45cb fix(deps): update module golang.org/x/crypto to v0.28.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-07 09:17:57 +00:00
openshift-merge-bot[bot]
67570fb208 Merge pull request #24178 from eriksjolund/fix-issue23954
podman-systemd.unit.5: adjust example options
2024-10-07 09:16:05 +00:00
Erik Sjölund
d0cb62aacc podman-systemd.unit.5: adjust example options
Use the reserved domain name example.com in the examples.
For details, see RFC 2606
https://datatracker.ietf.org/doc/html/rfc2606#section-3

Modify PublishPort examples to make them reflect more
common scenarios.

Fixes: https://github.com/containers/podman/issues/23954

Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
2024-10-06 17:31:41 +02:00
Erik Sjölund
374844817d docs: prefer --network to --net
The option --network is the more official option as it is
listed in

podman run --help
podman kube play --help

Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
2024-10-05 09:10:15 +02:00
openshift-merge-bot[bot]
8d5ec11d0b Merge pull request #24175 from containers/renovate/golang.org-x-term-0.x
fix(deps): update module golang.org/x/term to v0.25.0
2024-10-04 22:55:41 +00:00
renovate[bot]
1470961e6c fix(deps): update module golang.org/x/term to v0.25.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-04 21:32:59 +00:00
openshift-merge-bot[bot]
e6f530b4b3 Merge pull request #24170 from containers/renovate/golang.org-x-sys-0.x
fix(deps): update module golang.org/x/sys to v0.26.0
2024-10-04 17:06:13 +00:00
openshift-merge-bot[bot]
d28af234de Merge pull request #24164 from mheon/host_network_no_expose_in_ports
Exposed ports are only included when not --net=host
2024-10-04 17:03:40 +00:00
openshift-merge-bot[bot]
4b958b3fa0 Merge pull request #24169 from baude/OWNERS.update
OWNERS file audit and update
2024-10-04 17:01:24 +00:00
openshift-merge-bot[bot]
17d29a2f6d Merge pull request #24122 from PhrozenByte/docs-hosts-file
Mention `no_hosts` and `base_hosts_file` configs in CLI option docs
2024-10-04 16:58:13 +00:00
openshift-merge-bot[bot]
1f7fe1d1e8 Merge pull request #24167 from giuseppe/improve-check-for-current-user-mapped
libpod: hasCurrentUserMapped checks for gid too
2024-10-04 16:55:13 +00:00
openshift-merge-bot[bot]
d6da198c87 Merge pull request #24166 from ygalblum/doc-testflags
[CI:DOCS] Document TESTFLAGS in test README file
2024-10-04 16:52:29 +00:00
renovate[bot]
567906ed5b fix(deps): update module github.com/mattn/go-sqlite3 to v1.14.24
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-04 16:43:01 +00:00
renovate[bot]
53785ed055 fix(deps): update module golang.org/x/sys to v0.26.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-04 15:31:29 +00:00
openshift-merge-bot[bot]
e9e9f7e1ff Merge pull request #24124 from mheon/validate_bind_propagation
Validate the bind-propagation option to `--mount`
2024-10-04 15:29:58 +00:00
Brent Baude
505c585b49 OWNERS file audit and update
Update OWNERS file specifically around `approvers`.  Also, added Mario.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2024-10-04 10:26:45 -05:00
Matt Heon
8061553c0f Exposed ports are only included when not --net=host
Undoing some of my own work here from #24090 now that we have the
ExposedPorts field implemented in inspect. I considered a revert
of that patch, but it's still needed as without it we'd be
including exposed ports when --net=container which is not
correct.

Basically, exposed ports for a container should always go in the
new ExposedPorts field we added. They sometimes go in the Ports
field in NetworkSettings, but only when the container is not
net=host and not net=container. We were always including exposed
ports, which was not correct, but is an easy logical fix.

Also required is a test change to correct the expected behavior
as we were testing for incorrect behavior.

Fixes https://issues.redhat.com/browse/RHEL-60382

Signed-off-by: Matt Heon <mheon@redhat.com>
2024-10-04 11:19:43 -04:00
Giuseppe Scrivano
e46ae46f18 libpod: hasCurrentUserMapped checks for gid too
the kernel checks that both the uid and the gid are mapped inside the
user namespace, not only the uid:

/**
 * privileged_wrt_inode_uidgid - Do capabilities in the namespace work over the inode?
 * @ns: The user namespace in question
 * @idmap: idmap of the mount @inode was found from
 * @inode: The inode in question
 *
 * Return true if the inode uid and gid are within the namespace.
 */
bool privileged_wrt_inode_uidgid(struct user_namespace *ns,
				 struct mnt_idmap *idmap,
				 const struct inode *inode)
{
	return vfsuid_has_mapping(ns, i_uid_into_vfsuid(idmap, inode)) &&
	       vfsgid_has_mapping(ns, i_gid_into_vfsgid(idmap, inode));
}

for this reason, improve the check for hasCurrentUserMapped to verify
that the gid is also mapped, and if it is not, use an intermediate
mount for the container rootfs.

Closes: https://github.com/containers/podman/issues/24159

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2024-10-04 16:17:04 +02:00
Ygal Blum
e948c4ed90 [CI:DOCS] Document TESTFLAGS in test README file
Signed-off-by: Ygal Blum <ygal.blum@gmail.com>
2024-10-04 10:16:27 -04:00
openshift-merge-bot[bot]
30a25a0d3d Merge pull request #24135 from Luap99/vendor
vendor: update c/common and buildah
2024-10-04 13:14:43 +00:00
Matt Heon
985b57d9f7 Validate the bind-propagation option to --mount
Similar to github.com/containers/buildah/pull/5761 but not
security critical as Podman does not have an expectation that
mounts are scoped (the ability to write a --mount option is
already the ability to mount arbitrary content into the container
so sneaking arbitrary options into the mount doesn't have
security implications). Still, bad practice to let users inject
anything into the mount command line so let's not do that.

Signed-off-by: Matt Heon <mheon@redhat.com>
2024-10-04 09:07:51 -04:00
openshift-merge-bot[bot]
1df98eeb9d Merge pull request #24154 from ehelms/fix-podman-secret-inspect-examples
Fix typo in secret inspect examples
2024-10-04 12:14:09 +00:00
openshift-merge-bot[bot]
73ff0a4538 Merge pull request #24129 from ygalblum/makefile-ginkgo-silence-skips
Makefile - silence skipped tests when focusing on a file
2024-10-04 10:26:54 +00:00
Eric D. Helms
d8b26ac1b4 Fix typo in secret inspect examples
Signed-off-by: Eric D. Helms <ericdhelms@gmail.com>
2024-10-03 15:23:07 -04:00
Daniel Rudolf
6f9cc3755a Mention no_hosts and base_hosts_file configs in CLI option docs
Follow-up to #24043

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
2024-10-02 23:15:24 +02:00
openshift-merge-bot[bot]
70f31281d6 Merge pull request #24114 from kolyshkin/sys-cap
vendor: switch to moby/sys/capability
2024-10-02 16:56:54 +00:00
Ed Santiago
043b82ef59 Fixes for vendoring Buildah
This commit was automatically cherry-picked
by buildah-vendor-treadmill v0.3
from the buildah vendor treadmill PR, #13808

  * Fix conflict caused by Ed's local-registry PR in buildah
  * Wire in "new" --retry and --retry-delay, these existed for longer
    but where non functional.

Signed-off-by: Ed Santiago <santiago@redhat.com>
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-10-02 18:38:38 +02:00
Paul Holzinger
83a0299309 vendor: update buildah to latest
Includes a fix for CVE-2024-9407

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-10-02 18:04:39 +02:00
openshift-merge-bot[bot]
4eb43de41a Merge pull request #24128 from ygalblum/quadlet-remove-equal-sign
Quadlet - prefer "param val" over "param=val" to allow env expansion
2024-10-02 15:34:35 +00:00
Ygal Blum
23f256349b Makefile - silence skipped tests when focusing on a file
Signed-off-by: Ygal Blum <ygal.blum@gmail.com>
2024-10-02 09:54:06 -04:00
openshift-merge-bot[bot]
75a6a6681d Merge pull request #24110 from mheon/fix_rhel_60382_round_2
Add ExposedPorts to Inspect's ContainerConfig
2024-10-02 13:41:34 +00:00
openshift-merge-bot[bot]
06f24180ce Merge pull request #24125 from edsantiago/ci-desired-network
CI: require and test CI_DESIRED_NETWORK on RHEL
2024-10-02 12:48:49 +00:00
Paul Holzinger
dde1c3d98c vendor: update to latest c/common
Includes a fix for CVE-2024-9341

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-10-02 11:24:01 +02:00