16864 Commits

Author SHA1 Message Date
aeedf52bde Merge pull request #21296 from jt-nti/readthedocs-build-v4.3
[CI:DOCS] Enable readthedocs build on v4.3
2024-01-18 21:04:10 +00:00
6f69429f59 Enable readthedocs build on v4.3
Signed-off-by: James Taylor <jamest@uk.ibm.com>
2024-01-18 19:49:52 +00:00
239617df78 [CI:DOCS] Migrate OSX Cross to M1
Migrate our OSX Cross build to a M1 instance, since Cirrus is sunsetting Intel-based macOS instances.

Signed-off-by: Ashley Cui <acui@redhat.com>
2024-01-18 19:49:14 +00:00
1d121d4b83 Merge pull request #19875 from vrothberg/reset-backport-v4.3
[v4.3] system reset: show graphRoot/runRoot before removal
2023-09-06 16:18:23 +02:00
88204ef82d [v4.3] system reset: show graphRoot/runRoot before removal
Backport of commit 6aaf6a28435c.

system reset it says it will delete containers, images, networks, etc...
However it will also delete the graphRoot and runRoot directories.
Normally this is not an issue, however in same cases these directories
were set to the users home directory or some other important system
directory.

As first step simply show the directories that are configured and thus
will be deleted by reset. As future step we could implement some
safeguard will will not delete some known important directories however
I tried to keep it simple for now.

[NO NEW TESTS NEEDED]

see #18349 and #18295

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2023-09-06 15:17:19 +02:00
0a984598d8 Merge pull request #19209 from haircommander/bump-runc-4.3
[4.3] libpod: use new libcontainer blockIO constructors
2023-07-12 10:08:04 -04:00
7aa19881ce libpod: use new libcontainer blockIO constructors
[NO NEW TESTS NEEDED]

Signed-off-by: Peter Hunt <pehunt@redhat.com>
2023-07-12 09:06:23 -04:00
588c6ecc76 Merge pull request #16588 from flouthoc/v4.3
[release-v4.3] vendor: bump buildah to `v1.28.1`
2022-11-28 05:54:24 -05:00
58f5d2208b vendor: bump buildah to v1.28.1
Contains backport of containers/buildah#4411

[NO NEW TESTS NEEDED]
[NO TESTS NEEDED]

Signed-off-by: Aditya R <arajan@redhat.com>
2022-11-28 12:40:23 +05:30
546b73ffc5 buildah-bud-tests: remove temp patch
Signed-off-by: Aditya R <arajan@redhat.com>
2022-11-28 12:40:15 +05:30
2974497710 Merge pull request #16535 from edsantiago/flake_backport
[v4.3] More log-flake work
2022-11-17 08:31:26 +00:00
246cc18746 More log-flake work
[backport #16437]

It looks like #16132 was my fault: a missing 'wait' for a container
to exit. Let's see if this fixes the flake.

And, while poking through flake logs, I found another missing wait.

And... in wait_for_output(), address a potential race.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-11-16 07:50:05 -07:00
29c4455339 Merge pull request #16521 from flouthoc/v4.3
[release-v4.3] compat,build: handle docker's preconfigured `cacheTo`,`cacheFrom`
2022-11-15 21:52:24 +00:00
45d5f942a3 compat,build: handle docker's preconfigured cacheTo,cacheFrom
Docker's newer clients popuates `cacheFrom` and `cacheTo` parameter
by default as empty array for all commands but buildah's design of
distributed cache expects this to be a repo not image hence parse
only the first populated repo and igore if empty array.

Signed-off-by: Aditya R <arajan@redhat.com>
2022-11-15 22:11:23 +05:30
8dfa3371e1 Merge pull request #16519 from lsm5/v4.3-backports
[v4.3] v4.3 backports
2022-11-15 16:36:00 +00:00
fdfee8a9ef Fix search_test to return correct version of alpine
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
(cherry picked from commit ae9a2d26dff444ec946387c9bc9f74140806613e)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-11-15 19:23:01 +05:30
2f0aedd4db sig-proxy test: bump timeout
Bump the timeout waiting for the container to process the signal.
The comparatively short timeout is most likely responsible for
flakes in gating tests.

Fixes: #16091
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
(cherry picked from commit f0ba2d89e8616e5983dbd4a578bb611f81852a18)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-11-15 19:22:50 +05:30
4b914a6bcc Merge pull request #16465 from ashley-cui/bump_v4.3.1
Bump to v4.3.1
2022-11-10 09:10:08 +00:00
fc641ef839 Bump to 4.3.2-dev
Signed-off-by: Ashley Cui <acui@redhat.com>
2022-11-09 15:45:25 -05:00
814b7b003c Bump to v4.3.1
Signed-off-by: Ashley Cui <acui@redhat.com>
v4.3.1
2022-11-09 15:43:58 -05:00
05498680c4 Release notes for 4.3.1
Signed-off-by: Ashley Cui <acui@redhat.com>
2022-11-09 15:43:03 -05:00
f2d838d623 Merge pull request #16459 from mtrmac/c-image-release
[v4.3] Bump c/image to released v5.23.1
2022-11-09 15:32:44 -05:00
684f47010f Bump c/image to released v5.23.1
The only change is the version number.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2022-11-09 19:07:59 +01:00
6b49e1d181 Merge pull request #16448 from openshift-cherrypick-robot/cherry-pick-16327-to-v4.3
[v4.3] Fix deadlock between 'podman ps' and 'container inspect' commands
2022-11-08 12:48:40 -06:00
560dbcc041 Fix deadlock between 'podman ps' and 'container inspect' commands
Fixes: #16326

[NO NEW TESTS NEEDED]

Signed-off-by: Mikhail Khachayants <tyler92@inbox.ru>
2022-11-08 16:51:24 +00:00
3266e7307e Merge pull request #16313 from edsantiago/fix_ubi8_b0rkage_v43
[v4.3] FIXME: Temporary workaround for ubi8 CI breakage
2022-10-27 07:21:32 -04:00
52a6516f96 FIXME: Temporary workaround for ubi8 CI breakage
Emergency import of https://github.com/containers/buildah/pull/4377
required because the ubi8 image changed behind our backs.

On podman main, this commit will be reverted by Ed's
treadmill as soon as a new buildah is vendored into podman.

On side branches, the human doing the vendoring will need to
perform manual surgery. I hope the instructions are good enough.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-10-26 14:33:08 -06:00
9ce592fcb9 Merge pull request #16241 from mtrmac/c-image-5.23-backports
[v4.3] Update c/image from release-5.23 branch
2022-10-20 17:25:31 -04:00
83b02f8fd3 Update c/image from release-5.23 branch
... to fix pushes of sigstore data to quay.io, and
reads from redhat.io with sigstore enabled.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2022-10-20 18:19:34 +02:00
1e39ff0d1f Merge pull request #16231 from edsantiago/fix_broken_bashisms
[v4.3] system tests: fix broken bashisms
2022-10-19 19:44:32 -04:00
14563ef132 system tests: fix broken bashisms
gating tests failing on rawhide, and will probably fail
on f36 and f37 due to long-broken bugs that are now
caught by (bats, I think? new version of bash? who knows).

This is a partial cherry-pick of #16220, omitting the
change to testimage (not needed here)

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-10-19 13:49:11 -06:00
bd2ad61783 Merge pull request #16221 from mheon/bump_430
Bump to v4.3.0
2022-10-19 07:49:48 -04:00
34ebb9af21 Release notes fixes
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2022-10-18 15:34:58 -04:00
d5a0dfc1e8 Bump to v4.3.1-dev
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2022-10-18 14:00:18 -04:00
ad42af9490 Bump to v4.3.0
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
v4.3.0
2022-10-18 13:55:57 -04:00
9496a38361 Final release notes for v4.3.0
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2022-10-18 13:55:38 -04:00
ac7fa8437d libpod: Add support for 'podman top' on FreeBSD
This simply runs ps(1) on the host and filters for processes inside the
container.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-10-18 13:53:47 -04:00
f8a79409c4 libpod: Factor out jail name construction from stats_freebsd.go
[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-10-18 13:53:42 -04:00
e33306683e pkg/util: Add pid information descriptors for FreeBSD
[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-10-18 13:53:37 -04:00
3810a9dac0 [CI:BUILD] copr: podman rpm should depend on containers-common-extra
containers-common now has a new `-extra` subpackage which handles
dependencies common to podman and buildah and also depends on
the main package `containers-common` itself.

The podman-next copr rebuilds containers-common from the rawhide branch
of dist-git so it will always have the latest version and will also
supersede the official containers-common packages (except on rawhide
where it will be equal).

Fixes: #16137

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-10-18 13:53:23 -04:00
94499aa472 Podman image: Set default_sysctls to empty for rootless containers
Avoids the error "Error: error preparing container xyz... for attach:
crun: open /proc/sys/net/ipv4/ping_group_range: Read-only file system:
OCI runtime error" when using `podman run --net bridge` inside rootful
Podman running without --security-opt unmask=ALL (or 'unmask=/proc/*')

Signed-off-by: Joakim Nohlgård <joakim@nohlgard.se>
2022-10-18 13:53:12 -04:00
8a28b896bb Allow volume mount dups, iff source and dest dirs
Also create one constant for ErrDuplicateDest, rather then have the same
value set three times.

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

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-10-18 13:52:32 -04:00
295d0d1d9a libpod: Factor out the call to PidFdOpen from (*Container).WaitForExit
This allows us to add a simple stub for FreeBSD which returns -1,
leading WaitForExit to fall back to the sleep loop approach.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-10-18 13:51:43 -04:00
c9c683a587 markdown-preprocess: add generic include mechanism
This is what was supposed to be an easy two-or-three-line
change to enable a more general-purpose include mechanism
than '@@option'; one that could include an arbitrary file.

This is commit 2 of 2, the "easy" part. Unfortunately, it's
not looking good. The source .md file has UTF8 checkmarks,
and nroff is not happy with those: the generated man pages
are gross.

Another problem: the source .md might need tweaking, because
we don't want a level 1 header in the man page. Obvious solution
is to make kubernetes_support.md a .md.in file as well, and
move the tables to a separate file (or files). Deferred for later.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-10-18 13:51:30 -04:00
42a2218740 markdown-preprocess: almost complete OO rewrite
Refactoring needed in order to add a more general-purpose
include mechanism. Functionality remains the same, and
oh, how I've tested! Unfortunately it's not possible to
review this, at least, not via diffs. Should you be
inclined to review, you'll need to treat it as a
completely brand-new script and test.

This is commit 1 of 2: basically, retain 100% compatibility
with what we have at the moment. Commit 2 will add the
new include mechanism. That one is easy to review.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-10-18 13:51:25 -04:00
ca9eaec5ea bump golangci-lint to v1.49.0
Motivated to have a working `make lint` on Fedora 37 (beta).
Most changes come from the new `gofmt` standards.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-10-18 13:51:10 -04:00
6972d47fff rootless: fix return value handling
[NO NEW TESTS NEEDED]

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

Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
2022-10-18 13:50:25 -04:00
5a214f6e56 generate systemd: set --stop-timeout for stopping containers
Make sure to always the stop timeout for unit generated via `--new`.

Fixes: #16149
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-10-18 13:50:00 -04:00
c6ad786ca4 Change to correct break statements
Signed-off-by: Jakob Tigerström <jakob.tigerstrom@gmail.com>
2022-10-18 13:48:25 -04:00
1a5506459e Add swagger install + allow version updates in CI
Support swagger testing and optional runtime updates similar to
the current golangci-lint tool.  This allows developers to update the
version of swagger at runtime if needed.  Otherwise new CI VM images
will pick up the prescribed version at image build-time via
`make install.tools`.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-10-18 13:47:37 -04:00